From 4c1248c5e9b934b23bdabbfc3d2dabdb8bab0656 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Mon, 17 Aug 2009 15:41:27 +0100 Subject: [PATCH] Full fix for the G-I support in Clutter Update the sed hack for the shared library to be more robust. Remove the --shared-library command line argument from g-ir-scanner, as no distribution will ever ship the .la files. This effectively reverts commit 68f8a98cfbf70e2b7bfcda7831907633eb08ca50. Signed-off-by: Emmanuele Bassi --- clutter/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 313193ef8..1cc2e6fd7 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -288,7 +288,7 @@ Clutter-@CLUTTER_API_VERSION@.typelib: $(clutter_json_gir) Cogl-@CLUTTER_API_VER # Clutter.gir to Cogl.gir Cogl-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir cogl/Cogl-@CLUTTER_API_VERSION@.gir shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter-@CLUTTER_API_VERSION@.gir` ; \ - sed "s/shared-library=\"clutter-cogl\"/shared-library=\"$$shlib\"/"< cogl/Cogl-@CLUTTER_API_VERSION@.gir > $@ + sed "s/shared-library=\"[^\"]*\"/shared-library=\"$$shlib\"/"< cogl/Cogl-@CLUTTER_API_VERSION@.gir > $@ BUILT_GIRSOURCES += Cogl-@CLUTTER_API_VERSION@.gir @@ -297,7 +297,7 @@ if LOCAL_JSON_GLIB # for Cogl above ClutterJson-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir json/ClutterJson-@CLUTTER_API_VERSION@.gir shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter-@CLUTTER_API_VERSION@.gir` ; \ - sed "s/shared-library=\"clutter-json\"/shared-library=\"$$shlib\"/"< json/ClutterJson-@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 @@ -315,7 +315,6 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=. \ - --shared-library=libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)