GNOME.org
 

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

commit 7a29cda1808c34856b91928a68ed0a4c686088e6
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Jul 21 19:29:37 2009 +0200

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

 applets/clock/Makefile.am             |   16 +++----
 applets/fish/Makefile.am              |    4 +-
 applets/notification_area/Makefile.am |    8 +--
 applets/wncklet/Makefile.am           |    4 +-
 configure.in                          |    5 +--
 gnome-panel/Makefile.am               |   11 ++---
 libpanel-applet/Makefile.am           |   10 ++--
 m4/shave.m4                           |   77 --------------------------------
 shave-libtool.in                      |   69 ----------------------------
 shave.in                              |   79 ---------------------------------
 10 files changed, 23 insertions(+), 260 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 4007a4a..87be581 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS = pixmaps
 
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 INCLUDES =							\
 	-I$(srcdir)/../../libpanel-applet			\
 	-I$(top_builddir)/libpanel-applet			\
@@ -77,16 +75,16 @@ BUILT_SOURCES =					\
 	clock-typebuiltins.h
 
 clock-marshallers.c: clock-marshallers.list
-	$(QUIET_GEN)glib-genmarshal --prefix _clock_marshal --header --body --internal $< > $@
+	$(AM_V_GEN)glib-genmarshal --prefix _clock_marshal --header --body --internal $< > $@
 
 clock-marshallers.h: clock-marshallers.list
-	$(QUIET_GEN)glib-genmarshal --prefix _clock_marshal --header --internal $< > $@
+	$(AM_V_GEN)glib-genmarshal --prefix _clock_marshal --header --internal $< > $@
 
 clock_enum_headers =					\
 	$(top_srcdir)/applets/clock/clock-utils.h
 
 clock-typebuiltins.c: @REBUILD@ $(clock_enum_headers)
-	$(QUIET_GEN)glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 			--fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"clock-typebuiltins.h\"\n\n" \
 			--fprod "\n/* enumerations from \"@filename \" */" \
@@ -102,7 +100,7 @@ clock-typebuiltins.c: @REBUILD@ $(clock_enum_headers)
 		$(clock_enum_headers) > $@
 
 clock-typebuiltins.h: @REBUILD@ $(clock_enum_headers)
-	$(QUIET_GEN)glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 			--fhead "#ifndef __CLOCK_TYPEBUILTINS_H__\n" \
 			--fhead "#define __CLOCK_TYPEBUILTINS_H__ 1\n\n" \
 			--fhead "G_BEGIN_DECLS\n\n" \
@@ -114,7 +112,7 @@ clock-typebuiltins.h: @REBUILD@ $(clock_enum_headers)
 		$(clock_enum_headers) >  $@
 
 gnome-clock-applet-mechanism-glue.h: $(srcdir)/gnome-clock-applet-mechanism.xml
-	$(QUIET_GEN)dbus-binding-tool \
+	$(AM_V_GEN)dbus-binding-tool \
 			--prefix=gnome_clock_applet_mechanism --mode=glib-server	\
 			--output=gnome-clock-applet-mechanism-glue.h			\
 			$(srcdir)/gnome-clock-applet-mechanism.xml
@@ -178,7 +176,7 @@ server_in_files = GNOME_ClockApplet_Factory.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files).in Makefile
-	$(QUIET_GEN)sed \
+	$(AM_V_GEN)sed \
 	    -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
 	    -e "s|\ TYPE\@|$(APPLET_TYPE)|" \
 	    -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
@@ -215,7 +213,7 @@ if HAVE_POLKIT
 dbus_services_DATA = $(dbus_services_in_files:.service.in=.service)
 
 $(dbus_services_DATA): $(dbus_services_in_files)
-	$(QUIET_GEN)sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	$(AM_V_GEN)sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
 dbus_conf_DATA = org.gnome.ClockApplet.Mechanism.conf
 
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 5832eae..910941b 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 INCLUDES =							\
 	-I$(srcdir)						\
 	-I$(srcdir)/../../libpanel-applet			\
@@ -68,7 +66,7 @@ server_in_files = GNOME_FishApplet_Factory.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files).in Makefile
-	$(QUIET_GEN)sed \
+	$(AM_V_GEN)sed \
 	    -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
 	    -e "s|\ TYPE\@|$(APPLET_TYPE)|" \
 	    -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index e824e14..9bfdcdb 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 INCLUDES =							\
 	-I$(srcdir)						\
 	-I$(srcdir)/../../libpanel-applet			\
@@ -60,7 +58,7 @@ server_in_files = GNOME_NotificationAreaApplet.server.in
 server_DATA     = GNOME_NotificationAreaApplet.server
 
 $(server_in_files): $(server_in_files).in Makefile
-	$(QUIET_GEN)sed \
+	$(AM_V_GEN)sed \
 	    -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
 	    -e "s|\ TYPE\@|$(APPLET_TYPE)|" \
 	    -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
@@ -83,10 +81,10 @@ CLEANFILES =                                    \
 	GNOME_NotificationAreaApplet.server
 
 na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL)
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@
 
 na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
-	$(QUIET_GEN)echo "#include \"na-marshal.h\"" > $@ && \
+	$(AM_V_GEN)echo "#include \"na-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@
 
 noinst_PROGRAMS = testtray
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index 382dc46..99785a7 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 INCLUDES = \
 	-I$(top_builddir) \
 	-I$(top_builddir)/applets/wncklet \
@@ -67,7 +65,7 @@ server_in_files = GNOME_Wncklet_Factory.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files).in Makefile
-	$(QUIET_GEN)sed \
+	$(AM_V_GEN)sed \
 	    -e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
 	    -e "s|\ TYPE\@|$(APPLET_TYPE)|" \
 	    -e "s|\ VERSION\@|$(PACKAGE_VERSION)|" \
diff --git a/configure.in b/configure.in
index 2eed4f3..2942ceb 100644
--- a/configure.in
+++ b/configure.in
@@ -2,6 +2,7 @@ AC_INIT([gnome-panel], [2.27.5],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_CONFIG_MACRO_DIR([m4])
 GNOME_COMMON_INIT
@@ -313,12 +314,8 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
-SHAVE_INIT([.], [enable])
-
 AC_OUTPUT([
 Makefile
-shave
-shave-libtool
 idl/Makefile
 icons/Makefile
 icons/16x16/Makefile
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index a3ea545..3ccd4b6 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -3,7 +3,6 @@ AUTOMAKE_OPTIONS = 1.3
 SUBDIRS = libpanel-util
 
 NULL =
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
 
 INCLUDES =							\
 	-I.							\
@@ -44,7 +43,7 @@ CORBA_SRCLIST =			\
 	$(NULL)
 
 $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
-	$(QUIET_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
+	$(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
 
 BUILT_SOURCES = \
 	$(CORBA_SRCLIST)	\
@@ -200,14 +199,14 @@ panel_enum_headers =					\
 	GNOME_Panel.h
 
 panel-marshal.h: panel-marshal.list $(GLIB_GENMARSHAL)
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@
 
 panel-marshal.c: panel-marshal.list $(GLIB_GENMARSHAL)
-	$(QUIET_GEN)echo "#include \"panel-marshal.h\"" > $@ && \
+	$(AM_V_GEN)echo "#include \"panel-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=panel_marshal >> $@
 
 panel-typebuiltins.c: @REBUILD@ $(panel_enum_headers)
-	$(QUIET_GEN)glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 			--fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"panel-typebuiltins.h\"\n\n" \
 			--fprod "\n/* enumerations from \"@filename \" */" \
@@ -223,7 +222,7 @@ panel-typebuiltins.c: @REBUILD@ $(panel_enum_headers)
 		$(panel_enum_headers) > $@
 
 panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers)
-	$(QUIET_GEN)glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 			--fhead "#ifndef __PANEL_TYPEBUILTINS_H__\n" \
 			--fhead "#define __PANEL_TYPEBUILTINS_H__ 1\n\n" \
 			--fhead "G_BEGIN_DECLS\n\n" \
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index 1b5a68f..d0686d9 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -45,7 +45,7 @@ CORBA_SRCLIST =			\
 	GNOME_Panel.h
 
 $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
-	$(QUIET_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
+	$(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
 
 noinst_PROGRAMS = test-bonobo-applet
 
@@ -77,16 +77,16 @@ EXTRA_DIST =					\
 	panel-test-applets.glade
 
 panel-applet-marshal.h: panel-applet-marshal.list $(GLIB_GENMARSHAL)
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
 
 panel-applet-marshal.c: panel-applet-marshal.list $(GLIB_GENMARSHAL)
-	$(QUIET_GEN)echo "#include \"panel-applet-marshal.h\"" > $@ && \
+	$(AM_V_GEN)echo "#include \"panel-applet-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=panel_applet_marshal >> $@
 
 panel_applet_enum_headers = $(top_srcdir)/libpanel-applet/panel-applet.h
 
 panel-applet-enums.c: @REBUILD@ $(panel_applet_enum_headers)
-	$(QUIET_GEN)glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 		     --fhead "#include <glib-object.h>\n" \
 		     --fhead "#include \"panel-applet-enums.h\"\n\n" \
 		     --fprod "\n/* enumerations from \"@filename \" */" \
@@ -102,7 +102,7 @@ panel-applet-enums.c: @REBUILD@ $(panel_applet_enum_headers)
 		$(panel_applet_enum_headers) > $@
 
 panel-applet-enums.h: @REBUILD@ $(panel_applet_enum_headers)
-	$(QUIET_GEN)glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 		     --fhead "#ifndef __PANEL_APPLET_ENUMS_H__\n" \
 		     --fhead "#define __PANEL_APPLET_ENUMS_H__\n\n" \
 		     --fhead "G_BEGIN_DECLS\n\n" \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]