GNOME.org
 

[empathy] Support silent build rules with automake 1.11

commit f687777360a213c638374c1d497ca849717ce174
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Jan 17 21:05:38 2010 +0100

    Support silent build rules with automake 1.11
    
    Support silent build rules, requires at least automake-1.11.
    Disable by either passing --disable-silent-rules to configure or
    passing V=1 to make.
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=585364
    
    Signed-off-by: Jonny Lamb <jonnylamb gnome org>

 .gitignore                 |    2 -
 configure.ac               |   11 +++---
 data/Makefile.am           |    2 +-
 extensions/Makefile.am     |   30 ++++++++---------
 libempathy-gtk/Makefile.am |   15 ++++----
 libempathy/Makefile.am     |   15 ++++----
 m4/shave.m4                |   77 ------------------------------------------
 shave-libtool.in           |   69 --------------------------------------
 shave.in                   |   79 --------------------------------------------
 src/Makefile.am            |    5 +--
 tools/Makefile.am          |   20 +++++------
 tools/shave.mk             |    1 -
 12 files changed, 46 insertions(+), 280 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 007184a..e77e1df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,5 +43,3 @@ cscope.out
 tags
 TAGS
 gnome-doc-utils.make
-shave
-shave-libtool
diff --git a/configure.ac b/configure.ac
index 863c56f..1286058 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,12 @@ AC_CONFIG_AUX_DIR(.)
 GNOME_COMMON_INIT
 
 AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define -Wno-portability)
+
+# Support silent build rules, requires at least automake-1.11. Disable
+# by either passing --disable-silent-rules to configure or passing V=1
+# to make
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AC_ISC_POSIX
 AC_PROG_CC
 AC_HEADER_STDC
@@ -442,8 +448,6 @@ AC_ARG_ENABLE(coding-style-checks,
 AC_SUBST([ENABLE_CODING_STYLE_CHECKS])
 # -----------------------------------------------------------
 
-SHAVE_INIT(.)
-
 AC_OUTPUT([
    Makefile
    data/Makefile
@@ -460,8 +464,6 @@ AC_OUTPUT([
    tests/interactive/Makefile
    tests/xml/Makefile
    tools/Makefile
-   shave
-   shave-libtool
 ])
 
 echo "
@@ -470,7 +472,6 @@ Configure summary:
 	Compiler....................:  ${CC}
 	Compiler Flags..............:  ${CFLAGS} ${ERROR_CFLAGS}
 	Prefix......................:  ${prefix}
-	Shaved build................:  ${enable_shave}
 	Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
 
     Features:
diff --git a/data/Makefile.am b/data/Makefile.am
index b2591d2..a4f37b6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -20,7 +20,7 @@ servicefile_in_files = org.freedesktop.Telepathy.Client.Empathy.service.in
 servicefile_DATA = $(servicefile_in_files:.service.in=.service)
 
 org.freedesktop.Telepathy.Client.Empathy.service: org.freedesktop.Telepathy.Client.Empathy.service.in
-	$(QUIET_GEN)sed -e "s|[ ]bindir[@]|$(bindir)|" $< > $@
+	$(AM_V_GEN)sed -e "s|[ ]bindir[@]|$(bindir)|" $< > $@
 
 clientfiledir = $(datarootdir)/telepathy/clients
 clientfile_DATA = Empathy.client
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 642b800..48d55b0 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
 tools_dir = $(top_srcdir)/tools
 
 AM_CPPFLAGS = $(DISABLE_DEPRECATED)
@@ -60,46 +58,46 @@ XSLTPROCFLAGS = --nonet --novalid
 # Generated files which can be generated for all categories simultaneously
 
 _gen/all.xml: all.xml $(wildcard *.xml)
-	$(mkdir_p) _gen
-	$(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
+	@$(mkdir_p) _gen
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
 		$< > $@
 
 extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
-	$(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
 		--param "allow-undefined-interfaces" "true()" \
 		$(tools_dir)/doc-generator.xsl \
 		$< > $@
 
 _gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
 	$(top_srcdir)/tools/glib-gtypes-generator.py
-	$(QUIET_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
 		$< _gen/gtypes Emp
 
 _gen/signals-marshal.list: _gen/all.xml \
 	$(tools_dir)/glib-signals-marshal-gen.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
 
 _gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) --header --prefix=_emp_ext_marshal $< > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_emp_ext_marshal $< > $@
 
 _gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am
-	$(QUIET_GEN){ echo '#include "_gen/signals-marshal.h"' && \
+	$(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \
 	$(GLIB_GENMARSHAL) --body --prefix=_emp_ext_marshal $< ; } > $@
 
 _gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \
 	$(tools_dir)/glib-client-marshaller-gen.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
 		_emp_ext > $@
 
 _gen/enums.h: _gen/all.xml \
 	$(tools_dir)/c-constants-gen.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py \
 		Emp \
 		$< > $@
 
 _gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \
 	$(tools_dir)/glib-interfaces-gen.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
 		Emp _gen/interfaces-body.h _gen/interfaces.h $<
 
 # Generated files which must be generated per "category". Each TpProxy
@@ -107,13 +105,13 @@ _gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \
 # although you can subdivide further if you want.
 
 _gen/misc.xml: misc.xml $(wildcard *.xml)
-	$(mkdir_p) _gen
-	$(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
+	@$(mkdir_p) _gen
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
 		$< > $@
 
 _gen/cli-misc-body.h _gen/cli-misc.h: _gen/misc.xml \
 	$(tools_dir)/glib-client-gen.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \
 		--group=misc \
 		--subclass=TpProxy \
 		--subclass-assert=TP_IS_PROXY \
@@ -123,7 +121,7 @@ _gen/cli-misc-body.h _gen/cli-misc.h: _gen/misc.xml \
 
 _gen/svc-misc.c _gen/svc-misc.h: _gen/misc.xml \
 	$(tools_dir)/glib-ginterface-gen.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
 		--filename=_gen/svc-misc \
 		--signal-marshal-prefix=_emp_ext \
 		--include='<telepathy-glib/dbus.h>' \
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 2dd50bb..5015e0a 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -1,4 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
 include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
@@ -164,27 +163,27 @@ ui_DATA = 					\
 	empathy-search-bar.ui
 
 empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am
-	$(QUIET_GEN)( cd $(srcdir) && \
+	$(AM_V_GEN)( cd $(srcdir) && \
 	sed -n -e 's/.*empathy_gtk_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
 	$(libempathy_gtk_la_SOURCES) ) \
 	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp
-	if cmp -s $  tmp $@; then \
+	@if cmp -s $  tmp $@; then \
 		rm $  tmp; \
 	else \
 		mv $  tmp $@; \
 	fi
 
 %-marshal.h: %-marshal.list Makefile
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
 
 %-marshal.c: %-marshal.list Makefile
-	$(QUIET_GEN)echo "#include \"empathy-gtk-marshal.h\"" > $@ && \
+	$(AM_V_GEN)echo "#include \"empathy-gtk-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
 
 empathy-gtk-enum-types.h: stamp-empathy-gtk-enum-types.h
-	$(QUIET_GEN)true
+	$(AM_V_GEN)true
 stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers)
-	$(QUIET_GEN)(cd $(srcdir) \
+	$(AM_V_GEN)(cd $(srcdir) \
 	&& glib-mkenums \
 			--fhead "#ifndef __LIBEMPATHY_GTK_ENUM_TYPES_H__\n" \
 			--fhead "#define __LIBEMPATHY_GTK_ENUM_TYPES_H__ 1\n\n" \
@@ -201,7 +200,7 @@ stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers)
 	&& echo timestamp > $(@F)
 
 empathy-gtk-enum-types.c: Makefile $(libempathy_gtk_headers)
-	$(QUIET_GEN)(cd $(srcdir) \
+	$(AM_V_GEN)(cd $(srcdir) \
 	&& glib-mkenums \
 			--fhead "#include <config.h>\n" \
 			--fhead "#include <glib-object.h>\n" \
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 0ccd2de..4d5acc6 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -1,4 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
 include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
@@ -124,27 +123,27 @@ include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
 empathy-marshal.list: $(libempathy_la_SOURCES) Makefile.am
-	$(QUIET_GEN)( cd $(srcdir) && \
+	$(AM_V_GEN)( cd $(srcdir) && \
 	sed -n -e 's/.*empathy_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
 	$(libempathy_la_SOURCES) ) \
 	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp
-	if cmp -s $  tmp $@; then \
+	@if cmp -s $  tmp $@; then \
 		rm $  tmp; \
 	else \
 		mv $  tmp $@; \
 	fi
 
 %-marshal.h: %-marshal.list Makefile
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
 
 %-marshal.c: %-marshal.list Makefile
-	$(QUIET_GEN)echo "#include \"empathy-marshal.h\"" > $@ && \
+	$(AM_V_GEN)echo "#include \"empathy-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
 
 empathy-enum-types.h: stamp-empathy-enum-types.h
-	$(QUIET_GEN)true
+	$(AM_V_GEN)true
 stamp-empathy-enum-types.h: $(libempathy_headers) Makefile
-	$(QUIET_GEN)(cd $(srcdir) \
+	$(AM_V_GEN)(cd $(srcdir) \
 	&& glib-mkenums \
 			--fhead "#ifndef __LIBEMPATHY_ENUM_TYPES_H__\n" \
 			--fhead "#define __LIBEMPATHY_ENUM_TYPES_H__ 1\n\n" \
@@ -161,7 +160,7 @@ stamp-empathy-enum-types.h: $(libempathy_headers) Makefile
 	&& echo timestamp > $(@F)
 
 empathy-enum-types.c: $(libempathy_headers) Makefile
-	$(QUIET_GEN)(cd $(srcdir) \
+	$(AM_V_GEN)(cd $(srcdir) \
 	&& glib-mkenums \
 			--fhead "#include <config.h>\n" \
 			--fhead "#include <glib-object.h>\n" \
diff --git a/src/Makefile.am b/src/Makefile.am
index 3370f9b..c3f6582 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
 include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =						\
@@ -102,7 +101,7 @@ dist_man_MANS =			\
 
 # rules for making the glib enum objects
 %-enumtypes.h: %.h Makefile.in
-	$(QUIET_GEN)glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 	--fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 	--fprod "/* enumerations from \"@filename \" */\n" \
 	--vhead "GType @enum_name _get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n"         \
@@ -110,7 +109,7 @@ dist_man_MANS =			\
 	$< > $@
 
 %-enumtypes.c: %.h Makefile.in
-	$(QUIET_GEN)glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 	--fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \
 	--fprod "\n/* enumerations from \"@filename \" */" \
 	--vhead "GType\n enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G Type@Value values[] = {"     \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8662b44..c9ac350 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
 abs_top_builddir = @abs_top_builddir@
 
 noinst_SCRIPTS = telepathy-glib-env
@@ -39,23 +37,23 @@ CLEANFILES = libtpcodegen.pyc libtpcodegen.pyo libglibcodegen.pyc libglibcodegen
 all: $(EXTRA_DIST)
 
 libglibcodegen.py: libtpcodegen.py
-	$(QUIET_GEN)touch $@
+	$(AM_V_GEN)touch $@
 c-constants-gen.py: libglibcodegen.py
-	$(QUIET_GEN)touch $@
+	$(AM_V_GEN)touch $@
 glib-client-marshaller-gen.py: libglibcodegen.py
-	$(QUIET_GEN)touch $@
+	$(AM_V_GEN)touch $@
 glib-errors-enum-body-gen.py: libglibcodegen.py
-	$(QUIET_GEN)touch $@
+	$(AM_V_GEN)touch $@
 glib-errors-enum-header-gen.py: libglibcodegen.py
-	$(QUIET_GEN)touch $@
+	$(AM_V_GEN)touch $@
 glib-ginterface-gen.py: libglibcodegen.py
-	$(QUIET_GEN)touch $@
+	$(AM_V_GEN)touch $@
 glib-gtypes-generator.py: libglibcodegen.py
-	$(QUIET_GEN)touch $@
+	$(AM_V_GEN)touch $@
 glib-interfaces-gen.py: libglibcodegen.py
-	$(QUIET_GEN)touch $@
+	$(AM_V_GEN)touch $@
 glib-signals-marshal-gen.py: libglibcodegen.py
-	$(QUIET_GEN)touch $@
+	$(AM_V_GEN)touch $@
 
 TELEPATHY_SPEC_SRCDIR = $(top_srcdir)/../telepathy-spec
 maintainer-update-from-telepathy-spec:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]