From 7654ef10abfc5f207603ecd9012c810adb62a52a Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 17 Jul 2009 15:10:06 -0400 Subject: [PATCH] Fix building introspection when dolt is not in use On some platforms (anything but Linux, and on obscure Linux architectures) dolt isn't used, so $(top_builddir)/doltlibtool won't exist. $(top_builddir)/libtool will always be generated even if dolt is used, so just use that unconditionally. We don't need the extra speed when linking the single program for introspection. http://bugzilla.openedhand.com/show_bug.cgi?id=1699 Signed-off-by: Emmanuele Bassi --- clutter/Makefile.am | 2 +- clutter/cogl/Makefile.am | 2 +- clutter/json/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 0acd9b2e9..e3c149a64 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -263,7 +263,7 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_ --include=Cogl-@CLUTTER_API_VERSION@ \ --include=ClutterJson-@CLUTTER_API_VERSION@ \ --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \ - --libtool="$(top_builddir)/doltlibtool" \ + --libtool="$(top_builddir)/libtool" \ --pkg gobject-2.0 \ --pkg pango \ --pkg pangocairo \ diff --git a/clutter/cogl/Makefile.am b/clutter/cogl/Makefile.am index c9dce0e57..afc2022f0 100644 --- a/clutter/cogl/Makefile.am +++ b/clutter/cogl/Makefile.am @@ -76,7 +76,7 @@ Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la --include=GL-1.0 \ --include=GObject-2.0 \ --library=clutter-cogl \ - --libtool="$(top_builddir)/doltlibtool" \ + --libtool="$(top_builddir)/libtool" \ --pkg gobject-2.0 \ --output $@ \ $(cogl_headers) diff --git a/clutter/json/Makefile.am b/clutter/json/Makefile.am index af15d0d25..06d03168b 100644 --- a/clutter/json/Makefile.am +++ b/clutter/json/Makefile.am @@ -41,7 +41,7 @@ ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json. --add-include-path=$(srcdir) --add-include-path=. \ --include=GObject-2.0 \ --library=clutter-json \ - --libtool="$(top_builddir)/doltlibtool" \ + --libtool="$(top_builddir)/libtool" \ --pkg gobject-2.0 \ --output $@ \ $(clutterjson_HEADERS) \