[telepathy-glib/master] Move from shave to use automake 1.11's silent rules feature.

Jonny Lamb jonny.lamb at collabora.co.uk
Thu Sep 24 11:11:00 PDT 2009


Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 .gitignore                      |    2 -
 autogen.sh                      |    9 ----
 configure.ac                    |    8 +--
 examples/extensions/Makefile.am |   26 ++++++-------
 m4/Makefile.am                  |    3 +-
 m4/shave.m4                     |   77 --------------------------------------
 shave-libtool.in                |   69 ----------------------------------
 shave.in                        |   79 ---------------------------------------
 telepathy-glib/Makefile.am      |   31 +++++++--------
 tests/dbus/Makefile.am          |    6 +--
 tools/Makefile.am               |   20 ++++-----
 11 files changed, 42 insertions(+), 288 deletions(-)
 delete mode 100644 m4/shave.m4
 delete mode 100644 shave-libtool.in
 delete mode 100644 shave.in

diff --git a/.gitignore b/.gitignore
index 6675ac5..f5e676d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,5 +70,3 @@ tests/test-*
 tests/tools/actual.h
 tests/tools/actual-body.h
 tools/telepathy-glib-env
-shave
-shave-libtool
diff --git a/autogen.sh b/autogen.sh
index f92b907..79a566f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -28,15 +28,6 @@ for arg in $*; do
     esac
 done
 
-# Workaround for gtk-doc + shave + libtool 1.x
-# See http://git.lespiau.name/cgit/shave/tree/README#n83
-sed -e 's#) --mode=compile#) --tag=CC --mode=compile#' gtk-doc.make \
-    > gtk-doc.temp \
-    && mv gtk-doc.temp gtk-doc.make
-sed -e 's#) --mode=link#) --tag=CC --mode=link#' gtk-doc.make \
-    > gtk-doc.temp \
-        && mv gtk-doc.temp gtk-doc.make
-
 if test $run_configure = true; then
     ./configure "$@"
 fi
diff --git a/configure.ac b/configure.ac
index e83f0af..2421d1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,8 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.9 -Wno-portability])
 AM_CONFIG_HEADER(config.h)
 
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+
 dnl check for tools
 AC_PROG_CC
 AC_PROG_CC_STDC
@@ -194,8 +196,6 @@ if test -z "$NM"; then
 fi
 AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], [test $HAVE_LD_VERSION_SCRIPT = yes])
 
-SHAVE_INIT(.)
-
 AC_OUTPUT( Makefile \
 	   docs/Makefile \
 	   docs/reference/Makefile \
@@ -219,7 +219,5 @@ AC_OUTPUT( Makefile \
 	   tests/dbus/Makefile \
 	   tests/tools/Makefile \
 	   tools/Makefile \
-	   m4/Makefile \
-	   shave \
-	   shave-libtool
+	   m4/Makefile
 )
diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am
index 2053010..ad15f47 100644
--- a/examples/extensions/Makefile.am
+++ b/examples/extensions/Makefile.am
@@ -9,8 +9,6 @@
 
 tools_dir = $(top_srcdir)/tools
 
-include $(tools_dir)/shave.mk
-
 AM_CFLAGS = \
     $(ERROR_CFLAGS) \
     $(DBUS_CFLAGS) \
@@ -68,43 +66,43 @@ XSLTPROCFLAGS = --nonet --novalid
 
 _gen/all.xml: all.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
 	$(mkdir_p) _gen
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
 
 extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
-	$(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
 		$(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 Example
 
 _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=_example_ext_marshal $< > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_example_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=_example_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 $< \
 		_example_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 \
 		Example \
 		$< > $@
 
 _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 \
 		Example _gen/interfaces-body.h _gen/interfaces.h $<
 
 # Generated files which must be generated per "category". Each TpProxy
@@ -113,11 +111,11 @@ _gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \
 
 _gen/connection.xml: connection.xml $(wildcard *.xml) $(tools_dir)/xincludator.py
 	$(mkdir_p) _gen
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
 
 _gen/cli-connection-body.h _gen/cli-connection.h: _gen/connection.xml \
 	$(tools_dir)/glib-client-gen.py Makefile.am
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \
 		--group=connection \
 		--subclass=TpConnection \
 		--subclass-assert=TP_IS_CONNECTION \
@@ -128,7 +126,7 @@ _gen/cli-connection-body.h _gen/cli-connection.h: _gen/connection.xml \
 
 _gen/svc-connection.c _gen/svc-connection.h: _gen/connection.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-connection \
 		--signal-marshal-prefix=_example_ext \
 		--include='<telepathy-glib/dbus.h>' \
diff --git a/m4/Makefile.am b/m4/Makefile.am
index e72117c..e04d0cb 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -3,5 +3,4 @@ compiler.m4 \
 gtk-doc.m4 \
 linker.m4 \
 tp-compiler-flag.m4 \
-tp-compiler-warnings.m4 \
-shave.m4
+tp-compiler-warnings.m4
diff --git a/m4/shave.m4 b/m4/shave.m4
deleted file mode 100644
index 0a3509e..0000000
--- a/m4/shave.m4
+++ /dev/null
@@ -1,77 +0,0 @@
-dnl Make automake/libtool output more friendly to humans
-dnl  Damien Lespiau <damien.lespiau at gmail.com>
-dnl
-dnl SHAVE_INIT([shavedir],[default_mode])
-dnl
-dnl shavedir: the directory where the shave scripts are, it defaults to
-dnl           $(top_builddir)
-dnl default_mode: (enable|disable) default shave mode.  This parameter
-dnl               controls shave's behaviour when no option has been
-dnl               given to configure.  It defaults to disable.
-dnl
-dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
-dnl   before AC_CONFIG_FILE/AC_OUTPUT is perfect.  This macro rewrites CC and
-dnl   LIBTOOL, you don't want the configure tests to have these variables
-dnl   re-defined.
-dnl * This macro requires GNU make's -s option.
-
-AC_DEFUN([_SHAVE_ARG_ENABLE],
-[
-  AC_ARG_ENABLE([shave],
-    AS_HELP_STRING(
-      [--enable-shave],
-      [use shave to make the build pretty [[default=$1]]]),,
-      [enable_shave=$1]
-    )
-])
-
-AC_DEFUN([SHAVE_INIT],
-[
-  dnl you can tweak the default value of enable_shave
-  m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
-
-  if test x"$enable_shave" = xyes; then
-    dnl where can we find the shave scripts?
-    m4_if([$1],,
-      [shavedir="$ac_pwd"],
-      [shavedir="$ac_pwd/$1"])
-    AC_SUBST(shavedir)
-
-    dnl make is now quiet
-    AC_SUBST([MAKEFLAGS], [-s])
-    AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
-
-    dnl we need sed
-    AC_CHECK_PROG(SED,sed,sed,false)
-
-    dnl substitute libtool
-    SHAVE_SAVED_LIBTOOL=$LIBTOOL
-    LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
-    AC_SUBST(LIBTOOL)
-
-    dnl substitute cc/cxx
-    SHAVE_SAVED_CC=$CC
-    SHAVE_SAVED_CXX=$CXX
-    SHAVE_SAVED_FC=$FC
-    SHAVE_SAVED_F77=$F77
-    SHAVE_SAVED_OBJC=$OBJC
-    CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
-    CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
-    FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
-    F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
-    OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
-    AC_SUBST(CC)
-    AC_SUBST(CXX)
-    AC_SUBST(FC)
-    AC_SUBST(F77)
-    AC_SUBST(OBJC)
-
-    V=@
-  else
-    V=1
-  fi
-  Q='$(V:1=)'
-  AC_SUBST(V)
-  AC_SUBST(Q)
-])
-
diff --git a/shave-libtool.in b/shave-libtool.in
deleted file mode 100644
index 1f3a720..0000000
--- a/shave-libtool.in
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# we need sed
-SED=@SED@
-if test -z "$SED" ; then
-SED=sed
-fi
-
-lt_unmangle ()
-{
-   last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
-}
-
-# the real libtool to use
-LIBTOOL="$1"
-shift
-
-# if 1, don't print anything, the underlaying wrapper will do it
-pass_though=0
-
-# scan the arguments, keep the right ones for libtool, and discover the mode
-preserved_args=
-while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-    --mode=*)
-        mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
-        preserved_args="$preserved_args $opt"
-        ;;
-    -o)
-        lt_output="$1"
-        preserved_args="$preserved_args $opt"
-	;;
-    *)
-        preserved_args="$preserved_args $opt"
-        ;;
-      esac
-done
-
-case "$mode" in
-compile)
-    # shave will be called and print the actual CC/CXX/LINK line
-    preserved_args="$preserved_args --shave-mode=$mode"
-    pass_though=1
-    ;;
-link)
-    preserved_args="$preserved_args --shave-mode=$mode"
-    Q="  LINK  "
-    ;;
-*)
-    # let's u
-    # echo "*** libtool: Unimplemented mode: $mode, fill a bug report"
-    ;;
-esac
-
-lt_unmangle "$lt_output"
-output=$last_result
-
-if test -z $V; then
-    if test $pass_though -eq 0; then
-        echo "$Q$output"
-    fi
-    $LIBTOOL --silent $preserved_args
-else
-    echo $LIBTOOL $preserved_args
-    $LIBTOOL $preserved_args
-fi
diff --git a/shave.in b/shave.in
deleted file mode 100644
index 5c16f27..0000000
--- a/shave.in
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# we need sed
-SED=@SED@
-if test -z "$SED" ; then
-SED=sed
-fi
-
-lt_unmangle ()
-{
-   last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
-}
-
-# the tool to wrap (cc, cxx, ar, ranlib, ..)
-tool="$1"
-shift
-
-# the reel tool (to call)
-REEL_TOOL="$1"
-shift
-
-pass_through=0
-preserved_args=
-while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-    --shave-mode=*)
-        mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
-	;;
-    -o)
-        lt_output="$1"
-        preserved_args="$preserved_args $opt"
-	;;
-    *)
-        preserved_args="$preserved_args $opt"
-        ;;
-      esac
-done
-
-# mode=link is handled in the libtool wrapper
-case "$mode,$tool" in
-link,*)
-    pass_through=1
-    ;;
-*,cxx)
-    Q="  CXX   "
-    ;;
-*,cc)
-    Q="  CC    "
-    ;;
-*,fc)
-    Q="  FC    "
-    ;;
-*,f77)
-    Q="  F77   "
-    ;;
-*,objc)
-    Q="  OBJC   "
-    ;;
-*,*)
-    # should not happen
-    Q="  CC    "
-    ;;
-esac
-
-lt_unmangle "$lt_output"
-output=$last_result
-
-if test -z $V; then
-    if test $pass_through -eq 0; then
-        echo "$Q$output"
-    fi
-    $REEL_TOOL $preserved_args
-else
-    echo $REEL_TOOL $preserved_args
-    $REEL_TOOL $preserved_args
-fi
diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index 7a65ee5..810aaf7 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -1,4 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
 include $(top_srcdir)/tools/flymake.mk
 
 tpgincludedir=$(includedir)/telepathy-1.0/telepathy-glib
@@ -96,7 +95,7 @@ endif
 
 _gen/version-script.txt: $(ABI_LISTS) _gen/abi.txt Makefile.am \
 	$(top_srcdir)/tools/make-version-script.py
-	$(QUIET_GEN)$(PYTHON) $(top_srcdir)/tools/make-version-script.py \
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/make-version-script.py \
 		 --symbols=_gen/abi.txt $(MAKE_VERSION_SCRIPT_FLAGS) \
 		 $(ABI_LISTS:%=$(srcdir)/%) > $@
 	$(PYTHON) $(top_srcdir)/tools/make-version-script.py \
@@ -114,7 +113,7 @@ _gen/abi.txt: libtelepathy-glib-internal.la Makefile.am
 	grep " [DT] " < _gen/abi.nm > _gen/abi.funcs
 	cut -d" " -f3 < _gen/abi.funcs > _gen/abi.funcnames
 	grep "^tp" < _gen/abi.funcnames > _gen/abi.tpfuncnames
-	$(QUIET_GEN)sort -u < _gen/abi.tpfuncnames > $@
+	$(AM_V_GEN)sort -u < _gen/abi.tpfuncnames > $@
 
 libtelepathy_glib_la_LDFLAGS += \
     $(VERSION_SCRIPT_ARG)=_gen/version-script.txt
@@ -360,60 +359,60 @@ _gen/stable-stamp: $(wildcard *.xml) _gen/spec-stamp
 	touch $@
 
 _gen/stable-spec.xml: stable-interfaces.xml _gen/stable-stamp $(tools_dir)/xincludator.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
 
 # Things generated from the whole spec at once
 
 _gen/gtypes.h _gen/gtypes-body.h: _gen/stable-spec.xml \
 	$(tools_dir)/glib-gtypes-generator.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
 		_gen/stable-spec.xml \
 		_gen/gtypes Tp
 
 _gen/telepathy-enums.h: _gen/stable-spec.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 \
 		Tp \
 		$< > $@
 
 _gen/interfaces-body.h _gen/telepathy-interfaces.h: _gen/stable-spec.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 \
 		Tp _gen/interfaces-body.h _gen/telepathy-interfaces.h $<
 
 _gen/register-dbus-glib-marshallers-body.h: _gen/stable-spec.xml \
 	$(tools_dir)/glib-client-marshaller-gen.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< _tp > $@
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< _tp > $@
 
 _gen/tp-signals-marshal.list: $(tools_dir)/glib-signals-marshal-gen.py \
 	_gen/stable-spec.xml
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py \
 		_gen/stable-spec.xml > $@
 
 _gen/signals-marshal.list: signals-marshal.list _gen/tp-signals-marshal.list
-	$(QUIET_GEN)sort -u $^ > $@
+	$(AM_V_GEN)sort -u $^ > $@
 
 _gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) --header --prefix=_tp_marshal $< > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_tp_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=_tp_marshal $< ; } > $@
 
 _gen/error-str.h _gen/error-str.c: _gen/stable-spec.xml \
 	$(tools_dir)/glib-errors-str-gen.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-errors-str-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-errors-str-gen.py \
 		_gen/error-str $<
 
 # Things generated per interface
 
 _gen/tp-spec-%.xml: %.xml _gen/spec-stamp $(tools_dir)/xincludator.py
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@
 
 _gen/tp-svc-%.c _gen/tp-svc-%.h: _gen/tp-spec-%.xml \
 	$(tools_dir)/glib-ginterface-gen.py \
 	Makefile.am
-	$(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
 		--filename=_gen/tp-svc-$* \
 		--signal-marshal-prefix=_tp \
 		--include='<telepathy-glib/dbus.h>' \
@@ -424,7 +423,7 @@ _gen/tp-svc-%.c _gen/tp-svc-%.h: _gen/tp-spec-%.xml \
 _gen/tp-cli-%-body.h _gen/tp-cli-%.h: _gen/tp-spec-%.xml \
 	$(tools_dir)/glib-client-gen.py \
 	Makefile.am
-	$(QUIET_GEN)set -e; \
+	$(AM_V_GEN)set -e; \
 	subclass= ; \
 	subclass_assert= ; \
 	case $* in \
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 9be880e..33d5c4d 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
 noinst_PROGRAMS = \
     test-account \
     test-account-manager \
@@ -207,7 +205,7 @@ _gen/svc.c _gen/svc.h: with-properties.xml \
 	$(top_srcdir)/tools/glib-ginterface-gen.py \
 	Makefile.am
 	$(mkdir_p) _gen
-	$(QUIET_GEN)$(PYTHON) $(top_srcdir)/tools/glib-ginterface-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-ginterface-gen.py \
 		--filename=_gen/svc \
 		--signal-marshal-prefix=NOT_NEEDED \
 		$< Test_Svc_
@@ -215,4 +213,4 @@ _gen/svc.c _gen/svc.h: with-properties.xml \
 _gen/errors-check.h: $(top_srcdir)/spec/errors.xml \
 	$(top_srcdir)/tools/glib-errors-check-gen.py
 	$(mkdir_p) _gen
-	$(QUIET_GEN)$(PYTHON) $(top_srcdir)/tools/glib-errors-check-gen.py $< > $@
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-errors-check-gen.py $< > $@
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a817df4..63260d5 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
@@ -42,23 +40,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:
-- 
1.5.6.5



More information about the telepathy-commits mailing list