From ab376d961fee066f809169f32946a32700ea0e53 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 18 Oct 2009 17:12:12 +0100 Subject: [PATCH] build: De-nest the JSON from the introspection rules The JSON conditional rules can be moved outside the introspection conditional ones to avoid a nested check, as all the JSON rules do is setting up variables that may or may not be used. --- clutter/Makefile.am | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 088cde248..bc56bb5cc 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -215,18 +215,27 @@ clutter_HEADERS = \ DISTCLEANFILES += clutter-version.h EXTRA_DIST += clutter-version.h.in -if HAVE_INTROSPECTION BUILT_GIRSOURCES = if LOCAL_JSON_GLIB json_gir_include_path=--add-include-path=json json_gir_include=--include=ClutterJson-@CLUTTER_API_VERSION@ json_gir_pkg= + +# If we are building it, ClutterJson gets the same handling as described +# for Cogl above +ClutterJson-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir json/ClutterJson-@CLUTTER_API_VERSION@.gir + $(QUIET_GEN) \ + shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter-@CLUTTER_API_VERSION@.gir` ; \ + sed "s/shared-library=\"[^\"]*\"/shared-library=\"$$shlib\"/"< json/ClutterJson-@CLUTTER_API_VERSION@.gir > $@ + +BUILT_GIRSOURCES += ClutterJson-@CLUTTER_API_VERSION@.gir else json_gir_include=--include=Json-1.0 json_gir_pkg=--pkg json-glib-1.0 -endif +endif # LOCAL_JSON_GLIB +if HAVE_INTROSPECTION # We can't reference the list of COGL header files, since they are in a # subdir Makefile.am, so just extract them from cogl.h instead. The doc # comments for COGL are in the headers, so we don't need the source files. @@ -273,17 +282,6 @@ Cogl-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir cogl/cogl/Cogl BUILT_GIRSOURCES += Cogl-@CLUTTER_API_VERSION@.gir -if LOCAL_JSON_GLIB -# If we are building it, ClutterJson gets the same handling as described -# for Cogl above -ClutterJson-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir json/ClutterJson-@CLUTTER_API_VERSION@.gir - $(QUIET_GEN) \ - shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter-@CLUTTER_API_VERSION@.gir` ; \ - sed "s/shared-library=\"[^\"]*\"/shared-library=\"$$shlib\"/"< json/ClutterJson-@CLUTTER_API_VERSION@.gir > $@ - -BUILT_GIRSOURCES += ClutterJson-@CLUTTER_API_VERSION@.gir -endif - # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to # install anything - we need to install inside our prefix. girdir = $(datadir)/gir-1.0 @@ -302,4 +300,4 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -endif +endif # HAVE_INTROSPECTION