[telepathy-idle/master] Quiet build.

Will Thompson will.thompson at collabora.co.uk
Thu Sep 10 16:07:39 PDT 2009


---
 configure.ac           |    5 +++++
 extensions/Makefile.am |   19 ++++++++++---------
 src/Makefile.am        |   10 +++++-----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index bef504f..ed78d21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,11 @@ AC_INIT([telepathy-idle], [idle_version],
 
 AC_CONFIG_MACRO_DIR([m4])
 
+# Enable silent build rules by default, 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])])
+
 AM_INIT_AUTOMAKE([1.9 -Wno-portability])
 
 AM_PROG_LIBTOOL
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index fc67c5e..ff09ec2 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -34,18 +34,19 @@ DROP_NAMESPACE = sed -e 's at xmlns:tp="http://telepathy\.freedesktop\.org/wiki/Dbu
 XSLTPROCFLAGS = --nonet --novalid
 
 _gen/all.xml: all.xml $(wildcard *.xml)
-	$(mkdir_p) _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
-	$(XSLTPROC) $(XSLTPROCFLAGS) \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
 		$(tools_dir)/doc-generator.xsl \
 		$< > $@
 
 _gen/svc.c _gen/svc.h: _gen/all.xml \
 	$(tools_dir)/glib-ginterface-gen.py
-	$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
 		--filename=_gen/svc --signal-marshal-prefix=_idle_ext \
 		--include='<telepathy-glib/dbus.h>' \
 		--include='"_gen/signals-marshal.h"' \
@@ -53,22 +54,22 @@ _gen/svc.c _gen/svc.h: _gen/all.xml \
 		$< Idle_Svc_
 
 _gen/signals-marshal.list: _gen/all.xml $(tools_dir)/glib-signals-marshal-gen.py
-	$(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
-	$(GLIB_GENMARSHAL) --header --prefix=_idle_ext_marshal $< > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_idle_ext_marshal $< > $@
 
 _gen/signals-marshal.c: _gen/signals-marshal.list
-	$(GLIB_GENMARSHAL) --body --prefix=_idle_ext_marshal $< > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --body --prefix=_idle_ext_marshal $< > $@
 
 _gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-generator.xsl
-	$(XSLTPROC) $(XSLTPROCFLAGS) \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
 		--stringparam mixed-case-prefix Idle \
 		$(tools_dir)/c-constants-generator.xsl \
 		$< > $@
 
 _gen/interfaces.h: _gen/all.xml $(tools_dir)/c-interfaces-generator.xsl
-	$(XSLTPROC) $(XSLTPROCFLAGS) \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
 		--stringparam mixed-case-prefix Idle \
 		$(tools_dir)/c-interfaces-generator.xsl \
 		$< > $@
diff --git a/src/Makefile.am b/src/Makefile.am
index 0795300..6c3c296 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,20 +72,20 @@ ALL_LIBS = \
 	@TELEPATHY_LIBS@
 
 %-signals-marshal.h: %-signals-marshal.list Makefile
-	glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $*-signals-marshal.h
+	$(AM_V_GEN)glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $*-signals-marshal.h
 
 %-signals-marshal.c: %-signals-marshal.list Makefile
-	glib-genmarshal --body --prefix=$(subst -,_,$*)_marshal $< > $*-signals-marshal.c
+	$(AM_V_GEN)glib-genmarshal --body --prefix=$(subst -,_,$*)_marshal $< > $*-signals-marshal.c
 
 %-marshal.h: %-marshal.list Makefile
-	glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h
+	$(AM_V_GEN)glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h
 
 %-marshal.c: %-marshal.list Makefile
-	glib-genmarshal --body --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.c
+	$(AM_V_GEN)glib-genmarshal --body --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.c
 
 man_MANS = telepathy-idle.8
 
 EXTRA_DIST = telepathy-idle.8.in
 
 %.8: %.8.in Makefile
-	sed -e 's,[@]libexecdir[@], at libexecdir@,' < $< > $@
+	$(AM_V_GEN)sed -e 's,[@]libexecdir[@], at libexecdir@,' < $< > $@
-- 
1.5.6.5




More information about the telepathy-commits mailing list