[libgweather] [build] Use silent-rules instead of shave for quiet build

[Vincent Untz <vuntz src gnome org>]

commit 95edb51c84709c1591b2a2bdb5185b980349ee4b
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Jul 21 19:10:24 2009 +0200

    [build] Use silent-rules instead of shave for quiet build

 configure.in            |    6 +---
 data/Makefile.am        |   10 ++---
 libgweather/Makefile.am |    6 +--
 m4/shave.m4             |   77 ---------------------------------------------
 python/Makefile.am      |    4 +--
 shave-libtool.in        |   69 -----------------------------------------
 shave.in                |   79 -----------------------------------------------
 7 files changed, 8 insertions(+), 243 deletions(-)
---
diff --git a/configure.in b/configure.in
index 3866beb..8845a36 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.59)
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
-AC_CONFIG_MACRO_DIR([m4])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # Before making a release, the LT_VERSION string should be modified.
 # The string is of the form C:R:A.
@@ -245,15 +245,11 @@ AC_SUBST(GLADEDIR)
 ##################################################
 GTK_DOC_CHECK([1.9])
 
-SHAVE_INIT([.], [enable])
-
 dnl ***************************************************************************
 dnl *** Output Makefiles et al                                              ***
 dnl ***************************************************************************
 AC_OUTPUT([
 Makefile
-shave
-shave-libtool
 doc/Makefile
 po/Makefile.in
 po-locations/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 0c0c773..f654f25 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 libgweatherdtddir = $(pkgdatadir)
 libgweatherdtd_DATA = locations.dtd
 
@@ -13,7 +11,7 @@ LOCATIONS_STAMP =
 libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
 
 %.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
-	$(QUIET_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
+	$(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
 	if test "x$(COMPRESS_EXT)" = "x.gz"; then				\
 		gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;	\
 	fi
@@ -35,7 +33,7 @@ libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/
 $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
 
 $(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
-	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
+	$(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
 	for pofile in $(PO_LOCATIONS); do \
 		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
 		xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
@@ -61,10 +59,10 @@ check:
 
 ### Locations.xml.in rebuild
 rebuild-locations: locationdb.sqlite update-locations.py
-	$(QUIET_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
+	$(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
 
 locationdb.sqlite: build-locationdb.pl major-cities.txt sources/nsd_cccc.txt sources/POP_PLACES.txt sources/US_CONCISE.txt sources/geonames_dd_dms_date_*.txt city-fixups.pl station-fixups.pl
-	$(QUIET_GEN)$(srcdir)/build-locationdb.pl
+	$(AM_V_GEN)$(srcdir)/build-locationdb.pl
 
 EXTRA_DIST =	\
 	$(libgweatherlocations_in_files)	\
diff --git a/libgweather/Makefile.am b/libgweather/Makefile.am
index a5f15b2..bf22177 100644
--- a/libgweather/Makefile.am
+++ b/libgweather/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 lib_LTLIBRARIES = libgweather.la
 
 libgweatherincdir = $(includedir)/libgweather
@@ -64,13 +62,13 @@ libgweather_la_LDFLAGS = \
 MKENUMS_GENERATED = gweather-enum-types.c gweather-enum-types.h
 
 gweather-enum-types.h: $(gweather_new_headers)
-	$(QUIET_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) --template gweather-enum-types.h.tmpl \
+	$(AM_V_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) --template gweather-enum-types.h.tmpl \
 		$(gweather_new_headers) ) > gweather-enum-types.h.tmp \
 	&& mv gweather-enum-types.h.tmp gweather-enum-types.h \
 	|| rm -f gweather-enum-type.h.tmp
 
 gweather-enum-types.c: $(libgweatherinclude_HEADERS)
-	$(QUIET_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) --template gweather-enum-types.c.tmpl \
+	$(AM_V_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) --template gweather-enum-types.c.tmpl \
 		$(gweather_new_headers) ) > gweather-enum-types.c.tmp \
 	&& mv gweather-enum-types.c.tmp gweather-enum-types.c \
 	|| rm -f gweather-enum-type.c.tmp
diff --git a/python/Makefile.am b/python/Makefile.am
index 2e97a94..f7a7f2b 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,6 +1,4 @@
 if BUILD_PYTHON
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 INCLUDES =			\
 	$(PYTHON_INCLUDES)	\
 	$(PYGOBJECT_CFLAGS)	\
@@ -16,7 +14,7 @@ gweather.c: gweather.defs gweather.override
 CLEANFILES = gweather.c
 
 .defs.c:
-	$(QUIET_GEN)(cd $(srcdir)\
+	$(AM_V_GEN)(cd $(srcdir)\
 	 && pygtk-codegen-2.0 \
 		--register $(PYGTK_DEFS) \
 		--override $*.override \