[build] Clean up the eglnative and fruity Makefile.am

* Do not use CLUTTER_MAJORMINOR

* Use per-target compiler flags and libraries

diff --git a/clutter/eglnative/Makefile.am b/clutter/eglnative/Makefile.am
index ae8b2a9..6bbd241 100644 (file)
--- a/clutter/eglnative/Makefile.am
+++ b/clutter/eglnative/Makefile.am
@@ -1,4 +1,4 @@
-libclutterincludedir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter
+libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter
 libclutterinclude_HEADERS = clutter-egl.h
 
 INCLUDES = \
@@ -6,12 +6,9 @@ INCLUDES = \
         -DCLUTTER_COMPILATION \
        -I$(top_srcdir) \
        -I$(top_srcdir)/clutter \
-       -I$(top_builddir)/clutter \
-       $(CLUTTER_CFLAGS) \
-       $(CLUTTER_DEBUG_CFLAGS) \
-       $(MAINTAINER_CFLAGS)
+       -I$(top_builddir)/clutter
 
-LDADD = $(CLUTTER_LIBS)
+common_ldadd = $(CLUTTER_LIBS)
 
 noinst_LTLIBRARIES = libclutter-eglnative.la
 
@@ -22,3 +19,5 @@ libclutter_eglnative_la_SOURCES = \
        clutter-stage-egl.h \
        clutter-stage-egl.c \
        clutter-egl-headers.h
+libclutter_eglnative_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
+libclutter_eglnative_la_LIBADD = $(common_ldadd)

diff --git a/clutter/fruity/Makefile.am b/clutter/fruity/Makefile.am
index 6ca82de..56e6883 100644 (file)
--- a/clutter/fruity/Makefile.am
+++ b/clutter/fruity/Makefile.am
@@ -1,20 +1,19 @@
-libclutterincludedir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter
+libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter
 
 INCLUDES = \
-       -DG_LOG_DOMAIN=\"ClutterFruity\" \
-        -DCLUTTER_COMPILATION \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/clutter \
-       $(CLUTTER_CFLAGS) \
-       $(CLUTTER_DEBUG_CFLAGS) \
-       $(MAINTAINER_CFLAGS) \
-       -xobjective-c
+       -DG_LOG_DOMAIN=\"ClutterFruity\"        \
+        -DCLUTTER_COMPILATION                  \
+       -I$(top_srcdir)                         \
+       -I$(top_srcdir)/clutter                 \
+       -I$(top_builddir)/clutter
 
-LDADD = $(CLUTTER_LIBS)
+common_ldadd = $(CLUTTER_LIBS)
 
 noinst_LTLIBRARIES = libclutter-fruity.la
 
-libclutter_fruity_la_SOURCES =         \
+libclutter_fruity_la_CFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS) -xobjective-c
+libclutter_fruity_la_LIBADD = $(common_ldadd)
+libclutter_fruity_la_SOURCES =                 \
        clutter-backend-fruity.h        \
        clutter-backend-fruity.c        \
        clutter-stage-fruity.h          \