GNOME.org
 

[evince] [build] Get rid of shave with AM_SILENT_RULES automake option

commit 2db28e7ad29cc276902da68789e897537ff17912
Author: Javier Jardón <javierjc1982 gmail com>
Date:   Wed Jul 8 18:07:32 2009 +0100

    [build] Get rid of shave with AM_SILENT_RULES automake option
    
    Solves bgo#585355

 Makefile.am                                    |    2 +-
 configure.ac                                   |    6 +-
 cut-n-paste/gimpcellrenderertoggle/Makefile.am |    6 +-
 cut-n-paste/toolbar-editor/Makefile.am         |   10 +--
 libdocument/Makefile.am                        |    6 +-
 libview/Makefile.am                            |   10 +--
 m4/shave.m4                                    |   99 ---------------------
 shave-libtool.in                               |  109 ------------------------
 shave.in                                       |  102 ----------------------
 shell/Makefile.am                              |    8 +-
 10 files changed, 18 insertions(+), 340 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b8dca2e..7030b1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,7 @@ DISTCLEANFILES = 		\
 
 ACLOCAL_AMFLAGS = -I m4
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc --disable-shave --disable-nautilus
+DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc --disable-nautilus
 
 # Ignore scrollkeeper issues for now.  @#*$& scrollkeeper
 distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
diff --git a/configure.ac b/configure.ac
index 0ac156a..cff94e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,8 @@ if test -z "$enable_maintainer_mode"; then
 fi
 AM_MAINTAINER_MODE([enable])
 
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 AM_PROG_LIBTOOL
 
 AC_ISC_POSIX
@@ -660,8 +662,6 @@ AC_SUBST([EV_VIEW_LT_CURRENT_MINUS_AGE],[ev_view_lt_current_minus_age])
 
 # *****************************************************************************
 
-SHAVE_INIT([], [enable])
-
 AC_CONFIG_FILES([
 backend/Makefile
 backend/comics/Makefile
@@ -715,8 +715,6 @@ Makefile
 po/Makefile.in
 previewer/Makefile
 properties/Makefile
-shave
-shave-libtool
 shell/Makefile
 test/Makefile
 thumbnailer/Makefile
diff --git a/cut-n-paste/gimpcellrenderertoggle/Makefile.am b/cut-n-paste/gimpcellrenderertoggle/Makefile.am
index b88a6eb..1f0b3de 100644
--- a/cut-n-paste/gimpcellrenderertoggle/Makefile.am
+++ b/cut-n-paste/gimpcellrenderertoggle/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo ' GEN '$@;)
-
 noinst_LTLIBRARIES = libgimpcellrenderertoggle.la
 
 libgimpcellrenderertoggle_la_sources =	\
@@ -22,12 +20,12 @@ libgimpcellrenderertoggle_la_SOURCES = 			\
 libgimpcellrenderertoggle_la_extra_sources = gimpwidgetsmarshal.list
 
 gimpwidgetsmarshal.h: $(srcdir)/gimpwidgetsmarshal.list
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=_gimp_widgets_marshal $(srcdir)/gimpwidgetsmarshal.list --header >> xgen-wmh \
+	$(GLIB_GENMARSHAL) --prefix=_gimp_widgets_marshal $(srcdir)/gimpwidgetsmarshal.list --header >> xgen-wmh \
         && (cmp -s xgen-wmh $(@F) || cp xgen-wmh $(@F)) \
         && rm -f xgen-wmh xgen-wmh~
 
 gimpwidgetsmarshal.c: gimpwidgetsmarshal.h
-	$(QUIET_GEN)echo "#include \"gimpwidgetsmarshal.h\"" >> xgen-wmc \
+	echo "#include \"gimpwidgetsmarshal.h\"" >> xgen-wmc \
         && $(GLIB_GENMARSHAL) --prefix=_gimp_widgets_marshal $(srcdir)/gimpwidgetsmarshal.list --body >> xgen-wmc \
         && cp xgen-wmc $(@F) \
         && rm -f xgen-wmc xgen-wmc~
diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am
index fa56a49..a01c155 100644
--- a/cut-n-paste/toolbar-editor/Makefile.am
+++ b/cut-n-paste/toolbar-editor/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo ' GEN '$@;)
-
 EGGSOURCES = \
 	egg-editable-toolbar.c \
 	egg-toolbars-model.c \
@@ -46,19 +44,19 @@ stamp_files = \
 eggmarshalers.h: stamp-eggmarshalers.h
 	@true
 stamp-eggmarshalers.h: eggmarshalers.list
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h \
+	$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h \
 	&& echo timestamp > $(@F)
 
 eggmarshalers.c: stamp-eggmarshalers.c
 	@true
 stamp-eggmarshalers.c: eggmarshalers.list
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header --body > eggmarshalers.c \
+	$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header --body > eggmarshalers.c \
 	&& echo timestamp > $(@F)
 
 eggtypebuiltins.c: stamp-eggtypebuiltins.c
 	@true
 stamp-eggtypebuiltins.c: $(EGGHEADERS)
-	$(QUIET_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) \
+	( cd $(srcdir) && $(GLIB_MKENUMS) \
 		--fhead "#include <config.h>\n\n" \
 		--fhead "#include \"eggtypebuiltins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename \" */" \
@@ -79,7 +77,7 @@ stamp-eggtypebuiltins.c: $(EGGHEADERS)
 eggtypebuiltins.h: stamp-eggtypebuiltins.h
 	@true
 stamp-eggtypebuiltins.h: $(EGGHEADERS)
-	$(QUIET_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) \
+	( cd $(srcdir) && $(GLIB_MKENUMS) \
 		--fhead "#ifndef __EGGTYPEBUILTINS_H__\n" \
 		--fhead "#define __EGGTYPEBUILTINS_H__ 1\n\n" \
 		--fhead "#include <glib-object.h>\n\n" \
diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index b62f18a..6adfe0b 100644
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo ' GEN '$@;)
-
 lib_LTLIBRARIES = libevdocument.la
 
 NOINST_H_FILES =				\
@@ -118,13 +116,13 @@ ev-document-type-builtins.h: stamp-ev-document-type-builtins.h
 	@true
 
 stamp-ev-document-type-builtins.h: ev-document-type-builtins.h.template $(INST_H_FILES)
-	$(QUIET_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
+	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
 	&& (cmp -s xgen-etbh ev-document-type-builtins.h || cp xgen-etbh ev-document-type-builtins.h ) \
 	&& rm -f xgen-etbh \
 	&& echo timestamp > $(@F)
 
 ev-document-type-builtins.c: ev-document-type-builtins.c.template $(INST_H_FILES)
-	$(QUIET_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
+	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
 	&& (cmp -s xgen-etbc ev-document-type-builtins.c || cp xgen-etbc ev-document-type-builtins.c ) \
 	&& rm -f xgen-etbc
 
diff --git a/libview/Makefile.am b/libview/Makefile.am
index 889a90f..0bf23d0 100644
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo ' GEN '$@;)
-
 lib_LTLIBRARIES = libevview.la
 
 NOINST_H_FILES =			\
@@ -73,23 +71,23 @@ BUILT_SOURCES = 			\
 CLEANFILES = $(BUILT_SOURCES) stamp-ev-view-type-builtins.h
 
 ev-view-marshal.h: $(srcdir)/ev-view-marshal.list
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal > $@
+	$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal > $@
 
 ev-view-marshal.c: $(srcdir)/ev-view-marshal.list
-	$(QUIET_GEN)echo '#include <config.h>' > ev-view-marshal.c
+	echo '#include <config.h>' > ev-view-marshal.c
 	$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal --body >> $@
 
 ev-view-type-builtins.h: stamp-ev-view-type-builtins.h
 	@true
 
 stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template $(INST_H_FILES)
-	$(QUIET_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
+	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
 	&& (cmp -s xgen-etbh ev-view-type-builtins.h || cp xgen-etbh ev-view-type-builtins.h ) \
 	&& rm -f xgen-etbh \
 	&& echo timestamp > $(@F)
 
 ev-view-type-builtins.c: ev-view-type-builtins.c.template $(INST_H_FILES)
-	$(QUIET_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
+	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
 	&& (cmp -s xgen-etbc ev-view-type-builtins.c || cp xgen-etbc ev-view-type-builtins.c ) \
 	&& rm -f xgen-etbc
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index acca9b9..29b7e46 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo ' GEN '$@;)
-
 INCLUDES=							\
 	-DDATADIR=\"$(pkgdatadir)\"				\
 	-DGNOMEDATADIR=\"$(datadir)\"				\
@@ -118,14 +116,14 @@ EXTRA_DIST = ev-marshal.list		\
 
 
 ev-marshal.h: $(srcdir)/ev-marshal.list
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h
+	$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h
 
 ev-marshal.c: $(srcdir)/ev-marshal.list
-	$(QUIET_GEN)echo '#include "ev-marshal.h"' > ev-marshal.c
+	echo '#include "ev-marshal.h"' > ev-marshal.c
 	$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --body >> ev-marshal.c
 
 DISTCLEANFILES= \
 	ev-application-service.h
 
 ev-application-service.h: $(srcdir)/ev-application-service.xml
-	$(QUIET_GEN)dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
+	dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]