diff options
author | Colin Walters <walters@verbum.org> | 2009-08-16 22:59:31 -0400 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2009-08-16 23:01:42 -0400 |
commit | 8ceb93d9259042cc29498f26e25fa6577bf28417 (patch) | |
tree | 9ad584c1864f6c47e26b2edd6a8c785c7d4ed386 /gir | |
parent | 65a36a3bdbc161e9fefe997b07b22bcd4c552c86 (diff) | |
download | gobject-introspection-8ceb93d9259042cc29498f26e25fa6577bf28417.tar.gz |
Excise shave in favor of automake 1.11 silent rules
Shave is just way too invasive in the build system.
Diffstat (limited to 'gir')
-rw-r--r-- | gir/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am index c21b9860..a82cd991 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -32,7 +32,7 @@ GLib-2.0.gir: $(SCANNER_BIN) $(SCANNER_LIBS) Makefile glib-2.0.c --noclosure \ --output $@ \ --strip-prefix=g \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL)" \ --c-include="glib.h" \ --library=$(GLIB_LIBRARY) \ --pkg glib-2.0 \ @@ -66,7 +66,7 @@ GObject-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile --noclosure \ --output $@ \ --strip-prefix=g \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL_LIBTOOL)" \ --c-include="glib-object.h" \ --include=GLib-2.0 \ --library=$(GOBJECT_LIBRARY) \ @@ -98,7 +98,7 @@ GModule-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) --noclosure \ --output $@ \ --strip-prefix=g \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL_LIBTOOL)" \ --c-include="gmodule.h" \ --include=GLib-2.0 \ --library=$(GMODULE_LIBRARY) \ @@ -131,7 +131,7 @@ Gio-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(srcdir)/g --noclosure \ --output $@ \ --strip-prefix=g \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL)" \ --c-include="gio/gio.h" \ --include=GObject-2.0 \ --library=$(GIO_LIBRARY) \ @@ -156,7 +156,7 @@ GIRepository-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) $(GIREPOSIT --noclosure \ --output $@ \ --strip-prefix=g \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL)" \ --c-include="girepository.h" \ --include=GObject-2.0 \ --library=girepository-1.0 \ @@ -186,7 +186,7 @@ endif Everything-$(TYPELIB_VERSION).gir: libgirepository-everything-1.0.la everything.c everything.h $(SCANNER_BIN) $(SCANNER_LIBS) LPATH=$(builddir)/.libs $(CHECK_DEBUG) $(SCANNER) \ --include=GObject-2.0 \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL)" \ --library=girepository-everything-1.0 \ --namespace=Everything --nsversion=$(TYPELIB_VERSION) \ --pkg gobject-2.0 \ |