aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2010-01-18 04:05:38 +0800
committerJonny Lamb <jonnylamb@gnome.org>2010-01-18 05:57:13 +0800
commitf687777360a213c638374c1d497ca849717ce174 (patch)
tree3a6740e80f8e240d11942c99b028838b095eed6c /tools
parent6a1aecd8b35cee47c56326d4babc46a146a91be0 (diff)
downloadgsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar
gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar.gz
gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar.bz2
gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar.lz
gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar.xz
gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar.zst
gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.zip
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am20
-rw-r--r--tools/shave.mk1
2 files changed, 9 insertions, 12 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8662b44ae..c9ac350ee 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:
diff --git a/tools/shave.mk b/tools/shave.mk
deleted file mode 100644
index 53cb3bf5e..000000000
--- a/tools/shave.mk
+++ /dev/null
@@ -1 +0,0 @@
-QUIET_GEN = $(Q:@=@echo ' GEN '$@;)