From cc6aa6e4d537c5eec3fda85475f78bdf0da2ea10 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 12 Aug 2009 15:32:18 +0100 Subject: [PATCH] Clutter GIR depends on ClutterJson GIR conditionally If we're building Clutter with a system JSON-GLib we need to skip the typelib compilation of ClutterJson since we depend on Json-1.0.gir directly. --- clutter/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 16c24c81e..5dcff52f5 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -10,6 +10,7 @@ SUBDIRS += json clutter_json_include = -I$(top_srcdir)/clutter/json clutter_json_dep = json/libclutter-json.la clutter_json_libadd = $(top_builddir)/clutter/json/libclutter-json.la +clutter_json_gir = ClutterJson-@CLUTTER_API_VERSION@.gir endif DIST_SUBDIRS = pango glx eglx eglnative cogl sdl json osx x11 win32 fruity @@ -278,7 +279,7 @@ 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 +Clutter-@CLUTTER_API_VERSION@.typelib: $(clutter_json_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