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 /tests | |
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 'tests')
-rw-r--r-- | tests/scanner/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 9ad6ec39..ed8d3968 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -42,7 +42,7 @@ annotation-1.0.gir: libannotation.la annotation.c annotation.h utility-1.0.gir $ $(CHECK_DEBUG) $(SCANNER) \ --include=GObject-2.0 \ --include=utility-1.0 \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL)" \ --library=annotation \ --namespace=annotation \ --nsversion=1.0 \ @@ -55,7 +55,7 @@ drawable-1.0.gir: libdrawable.la drawable.c drawable.h utility-1.0.gir $(SCANNER $(CHECK_DEBUG) $(SCANNER) \ --include=GObject-2.0 \ --include=utility-1.0 \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL)" \ --library=drawable \ --namespace=drawable \ --nsversion=1.0 \ @@ -69,7 +69,7 @@ foo-1.0.gir: libfoo.la foo.c foo.h utility-1.0.gir $(SCANNER_BIN) $(SCANNER_LIBS --include=GObject-2.0 \ --include=utility-1.0 \ --c-include="foo.h" \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL)" \ --library=foo \ --namespace=foo \ --nsversion=1.0 \ @@ -81,7 +81,7 @@ GIRS += foo-1.0.gir utility-1.0.gir: libutility.la utility.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(CHECK_DEBUG) $(SCANNER) \ --include=GObject-2.0 \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL)" \ --library=utility \ --namespace=utility \ --nsversion=1.0 \ @@ -94,7 +94,7 @@ GIRS += utility-1.0.gir GtkFrob-1.0.gir: libgtkfrob.la gtkfrob.h $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(CHECK_DEBUG) $(SCANNER) \ --include=GObject-2.0 \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL)" \ --library=gtkfrob \ --namespace=GtkFrob \ --strip-prefix=Gtk \ @@ -112,7 +112,7 @@ barapp_LDFLAGS = -export-dynamic BarApp-1.0.gir: barapp $(SCANNER_BIN) $(SCANNER_LIBS) Makefile LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}:$(top_builddir)/girepository/.libs $(SCANNER) \ --include=GObject-2.0 \ - --libtool="$(SHAVE_SAVED_LIBTOOL)" \ + --libtool="$(LIBTOOL)" \ --program=./barapp \ --namespace=BarApp \ --strip-prefix=Bar \ |