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 <ebassi@linux.intel.com>
This commit is contained in:
Owen W. Taylor 2009-07-17 15:10:06 -04:00 committed by Emmanuele Bassi
parent 8ca87ea60f
commit 7654ef10ab
3 changed files with 3 additions and 3 deletions

View File

@ -263,7 +263,7 @@ Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_
--include=Cogl-@CLUTTER_API_VERSION@ \ --include=Cogl-@CLUTTER_API_VERSION@ \
--include=ClutterJson-@CLUTTER_API_VERSION@ \ --include=ClutterJson-@CLUTTER_API_VERSION@ \
--library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \ --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
--libtool="$(top_builddir)/doltlibtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gobject-2.0 \ --pkg gobject-2.0 \
--pkg pango \ --pkg pango \
--pkg pangocairo \ --pkg pangocairo \

View File

@ -76,7 +76,7 @@ Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la
--include=GL-1.0 \ --include=GL-1.0 \
--include=GObject-2.0 \ --include=GObject-2.0 \
--library=clutter-cogl \ --library=clutter-cogl \
--libtool="$(top_builddir)/doltlibtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gobject-2.0 \ --pkg gobject-2.0 \
--output $@ \ --output $@ \
$(cogl_headers) $(cogl_headers)

View File

@ -41,7 +41,7 @@ ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json.
--add-include-path=$(srcdir) --add-include-path=. \ --add-include-path=$(srcdir) --add-include-path=. \
--include=GObject-2.0 \ --include=GObject-2.0 \
--library=clutter-json \ --library=clutter-json \
--libtool="$(top_builddir)/doltlibtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gobject-2.0 \ --pkg gobject-2.0 \
--output $@ \ --output $@ \
$(clutterjson_HEADERS) \ $(clutterjson_HEADERS) \