[gobject-introspection] Excise shave in favor of automake 1.11 silent rules

[Colin Walters <walters src gnome org>]

commit 8ceb93d9259042cc29498f26e25fa6577bf28417
Author: Colin Walters <walters verbum org>
Date:   Sun Aug 16 22:59:31 2009 -0400

    Excise shave in favor of automake 1.11 silent rules
    
    Shave is just way too invasive in the build system.

 common.mk                 |    2 +-
 configure.ac              |    6 ++--
 gir/Makefile.am           |   12 ++++----
 m4/shave.m4               |   40 -------------------------
 scripts/shave-libtool.in  |   70 ---------------------------------------------
 scripts/shave.in          |   70 ---------------------------------------------
 tests/scanner/Makefile.am |   12 ++++----
 7 files changed, 16 insertions(+), 196 deletions(-)
---
diff --git a/common.mk b/common.mk
index 92da490..6068e9c 100644
--- a/common.mk
+++ b/common.mk
@@ -4,7 +4,7 @@ SCANNER_ENV = env PYTHONPATH=$(SCANNER_PYTHONPATH) \
 	UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
 	UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
 SCANNER_ARGS = -v --add-include-path=$(top_builddir)/gir --add-include-path=.
-SCANNER = $(SCANNER_ENV) $(SCANNER_BIN) $(SCANNER_ARGS)
+SCANNER = $(AM_V_GEN) $(SCANNER_ENV) $(SCANNER_BIN) $(SCANNER_ARGS)
 SCANNER_LIBS = \
 	$(top_srcdir)/giscanner/*.py \
 	$(top_builddir)/giscanner/libgiscanner.la \
diff --git a/configure.ac b/configure.ac
index e704b7f..3ac28fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,9 @@ AC_INIT(gobject-introspection, gi_version,
         http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection)
 AM_INIT_AUTOMAKE([1.7 -Wno-portability])
 AM_MAINTAINER_MODE
+
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
+
 AC_CONFIG_HEADER([config.h])
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -200,7 +203,6 @@ case "$host" in
 esac
 AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found]))
 
-SHAVE_INIT([scripts])
 AC_CONFIG_FILES([
 Makefile
 gir/Makefile
@@ -208,8 +210,6 @@ girepository/Makefile
 giscanner/Makefile
 giscanner/config.py
 m4/Makefile
-scripts/shave
-scripts/shave-libtool
 tools/Makefile
 tests/Makefile
 tests/invoke/Makefile
diff --git a/gir/Makefile.am b/gir/Makefile.am
index c21b986..a82cd99 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 \
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 9ad6ec3..ed8d396 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 \