Merge branch 'system-json-glib'

[profile/ivi/clutter.git] / clutter / Makefile.am

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index c636f3c..16c24c8 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -37,7 +37,7 @@ INCLUDES = \
        $(CLUTTER_CFLAGS)                               \
        $(NULL)
 
-AM_CFLAGS = $(GCC_FLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
+AM_CFLAGS = $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
 
 LDADD = \
        $(CLUTTER_LT_LDFLAGS) \
@@ -266,7 +266,7 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_
                --include=Cogl-@CLUTTER_API_VERSION@ \
                $(json_gir_include) \
                --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
-               --libtool="$(top_builddir)/doltlibtool" \
+               --libtool="$(top_builddir)/libtool" \
                --pkg gobject-2.0 \
                --pkg pango \
                --pkg pangocairo \
@@ -276,6 +276,10 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_
 
 BUILT_GIRSOURCES += Clutter-@CLUTTER_API_VERSION@.gir
 
+# ClutterJson.gir and Cogl.gir are used included into Clutter.gir, so need
+# to be built before the typelib is generated
+Clutter-@CLUTTER_API_VERSION@.typelib: ClutterJson-@CLUTTER_API_VERSION@.gir Cogl-@CLUTTER_API_VERSION@.gir
+
 # We build Cogl.gir in the cogl/ subdir, but it needs to reference the shared
 # library that it's built into, so we delay compiling the gir into typelib
 # until after we've built the shared library. To create the final Cogl.gir