[telepathy-gabble/master] Move from shave to automake 1.11's silent rules.
Jonny Lamb
jonny.lamb at collabora.co.uk
Tue Sep 29 01:45:46 PDT 2009
Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
.gitignore | 2 -
configure.ac | 11 +++--
data/Makefile.am | 8 +--
docs/Makefile.am | 6 +--
extensions/Makefile.am | 22 +++++------
lib/ext/Makefile.am | 2 +-
lib/gibber/Makefile.am | 10 ++---
lib/loudmouth/Makefile.am | 14 +++----
m4/Makefile.am | 3 +-
m4/shave.m4 | 77 --------------------------------------
shave-libtool.in | 69 ----------------------------------
shave.in | 79 ---------------------------------------
src/Makefile.am | 12 ++---
tests/twisted/Makefile.am | 4 +-
tests/twisted/tools/Makefile.am | 8 ++--
tools/Makefile.am | 7 +--
tools/shave.mk | 1 -
17 files changed, 46 insertions(+), 289 deletions(-)
delete mode 100644 m4/shave.m4
delete mode 100644 shave-libtool.in
delete mode 100644 shave.in
delete mode 100644 tools/shave.mk
diff --git a/.gitignore b/.gitignore
index ae21b17..55ca61c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,5 +88,3 @@ cscope.out
/tests/twisted/tools/*.service
/tests/twisted/with-session-bus-*.pid
/tests/twisted/with-session-bus-*.address
-/shave
-/shave-libtool
diff --git a/configure.ac b/configure.ac
index 5941e0f..37a44d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,8 @@ AM_CONFIG_HEADER(config.h)
AC_USE_SYSTEM_EXTENSIONS
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+
dnl check for tools
AC_PROG_CC
AC_PROG_CC_STDC
@@ -188,6 +190,9 @@ confcmd="$origdir"/"$srcdir"/lib/ext/wocky/configure
if test x$enable_wocky_gtk_doc != xno; then
confcmd="$confcmd --enable-gtk-doc"
fi
+if test x$enable_silent_rules != xno; then
+ confcmd="$confcmd --enable-silent-rules"
+fi
cd "$ac_top_build_prefix"lib/ext/wocky && echo "running $confcmd" &&
$confcmd ||
AC_MSG_ERROR([Failed to configure embedded Wocky tree])
@@ -216,8 +221,6 @@ fi
AC_CHECK_FUNCS(getifaddrs memset select strndup setresuid setreuid strerror)
-SHAVE_INIT(.)
-
AC_OUTPUT( Makefile \
docs/Makefile \
extensions/Makefile \
@@ -231,7 +234,5 @@ AC_OUTPUT( Makefile \
lib/Makefile \
lib/ext/Makefile \
lib/gibber/Makefile \
- lib/loudmouth/Makefile \
- shave \
- shave-libtool
+ lib/loudmouth/Makefile
)
diff --git a/data/Makefile.am b/data/Makefile.am
index ce3907d..0009345 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
EXTRA_DIST = gabble.service.in
managerdir = $(datadir)/telepathy/managers
@@ -13,10 +11,10 @@ service_DATA = org.freedesktop.Telepathy.ConnectionManager.gabble.service
# non-archaic tarballs)
org.freedesktop.Telepathy.ConnectionManager.gabble.service: gabble.service.in \
Makefile
- $(QUIET_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
+ $(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
CLEANFILES = $(service_DATA) $(manager_DATA)
$(manager_DATA): ../src/connection-manager.c ../src/write-mgr-file.c ../src/connection.h
- $(MAKE) -C ../src write-mgr-file
- $(QUIET_GEN)../src/write-mgr-file > $@
+ @$(MAKE) -C ../src write-mgr-file
+ $(AM_V_GEN)../src/write-mgr-file > $@
diff --git a/docs/Makefile.am b/docs/Makefile.am
index c9b9d92..5c99ae7 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
tools_dir = $(top_srcdir)/tools
# htmldir is not defined by autoconf < 2.59c
@@ -21,10 +19,10 @@ CLEANFILES = \
$(html_DATA)
%.8: %.8.in Makefile
- $(QUIET_GEN)sed -e 's,[@]libexecdir[@], at libexecdir@,' < $< > $@
+ $(AM_V_GEN)sed -e 's,[@]libexecdir[@], at libexecdir@,' < $< > $@
$(html_DATA): %.html: %.xml $(tools_dir)/xep.xsl
- $(QUIET_GEN)$(XSLTPROC) $(tools_dir)/xep.xsl $< > $@
+ $(AM_V_GEN)$(XSLTPROC) $(tools_dir)/xep.xsl $< > $@
proto-xep-upload: $(html_DATA)
rsync -P $(html_DATA) people.collabora.co.uk:public_html/
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index f365552..087310c 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
tools_dir = $(top_srcdir)/tools
EXTRA_DIST = \
@@ -50,19 +48,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) Makefile.am
- $(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 Makefile.am
- $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
--param "allow-undefined-interfaces" "true()" \
$(tools_dir)/doc-generator.xsl \
$< > $@
_gen/svc.c _gen/svc.h: _gen/all.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/svc --signal-marshal-prefix=_gabble_ext \
--include='<telepathy-glib/dbus.h>' \
--include='"_gen/signals-marshal.h"' \
@@ -73,26 +71,26 @@ _gen/svc.c _gen/svc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py \
_gen/signals-marshal.list: _gen/all.xml \
$(tools_dir)/glib-signals-marshal-gen.py \
Makefile.am
- $(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=_gabble_ext_marshal $< > $@
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_gabble_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=_gabble_ext_marshal $< ; } > $@
_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-gen.py \
Makefile.am
- $(QUIET_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py Gabble $< > $@
+ $(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py Gabble $< > $@
_gen/interfaces.h _gen/interfaces-body.h: _gen/all.xml \
$(tools_dir)/glib-interfaces-gen.py \
Makefile.am
- $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
+ $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
Gabble _gen/interfaces-body.h _gen/interfaces.h $<
_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
$(tools_dir)/glib-gtypes-generator.py Makefile.am
- $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
+ $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
$< _gen/gtypes Gabble
diff --git a/lib/ext/Makefile.am b/lib/ext/Makefile.am
index e34518c..88a30ae 100644
--- a/lib/ext/Makefile.am
+++ b/lib/ext/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS =
DIST_SUBDIRS = wocky
all-local:
- cd wocky && $(MAKE)
+ @cd wocky && $(MAKE)
clean-local:
if test -e wocky/Makefile ; then \
diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am
index f617a5e..8640693 100644
--- a/lib/gibber/Makefile.am
+++ b/lib/gibber/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
noinst_LTLIBRARIES = libgibber.la
BUILT_SOURCES = \
@@ -59,10 +57,10 @@ gibber-signals-marshal.list: $(OUR_SOURCES) Makefile.am
fi
%-signals-marshal.h: %-signals-marshal.list Makefile.am
- $(QUIET_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@
+ $(AM_V_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@
%-signals-marshal.c: %-signals-marshal.list Makefile.am
- $(QUIET_GEN){ echo '#include "$*-signals-marshal.h"' && \
+ $(AM_V_GEN){ echo '#include "$*-signals-marshal.h"' && \
glib-genmarshal --body --prefix=_$(subst -,_,$*)_signals_marshal $< ; \
} > $@
@@ -73,7 +71,7 @@ AM_LDFLAGS = $(GCOV_LIBS) @GLIB_LIBS@ @RESOLV_LIBS@
# 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 at _get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
@@ -81,7 +79,7 @@ AM_LDFLAGS = $(GCOV_LIBS) @GLIB_LIBS@ @RESOLV_LIBS@
$< > $@
%-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 at enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G at Type@Value values[] = {" \
diff --git a/lib/loudmouth/Makefile.am b/lib/loudmouth/Makefile.am
index 7859c2c..d785380 100644
--- a/lib/loudmouth/Makefile.am
+++ b/lib/loudmouth/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
noinst_LTLIBRARIES = libloudmouth.la
BUILT_SOURCES = \
@@ -35,11 +33,11 @@ dist-hook:
$(shell for x in $(BUILT_SOURCES); do rm -f $(distdir)/$$x ; done)
loudmouth-signals-marshal.list: $(OUR_SOURCES) Makefile.am
- $(QUIET_GEN)( cd $(srcdir) && \
+ $(AM_V_GEN)( cd $(srcdir) && \
sed -n -e 's/.*_loudmouth_signals_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
$(OUR_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
- if cmp -s $@.tmp $@; then \
+ @if cmp -s $@.tmp $@; then \
rm $@.tmp; \
touch $@; \
else \
@@ -47,10 +45,10 @@ loudmouth-signals-marshal.list: $(OUR_SOURCES) Makefile.am
fi
%-signals-marshal.h: %-signals-marshal.list Makefile.am
- $(QUIET_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@
+ $(AM_V_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@
%-signals-marshal.c: %-signals-marshal.list Makefile.am
- $(QUIET_GEN){ echo '#include "$*-signals-marshal.h"' && \
+ $(AM_V_GEN){ echo '#include "$*-signals-marshal.h"' && \
glib-genmarshal --body --prefix=_$(subst -,_,$*)_signals_marshal $< ; \
} > $@
@@ -61,7 +59,7 @@ AM_LDFLAGS = $(GCOV_LIBS) @GLIB_LIBS@ @RESOLV_LIBS@ @WOCKY_LIBS@
# 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 at _get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
@@ -69,7 +67,7 @@ AM_LDFLAGS = $(GCOV_LIBS) @GLIB_LIBS@ @RESOLV_LIBS@ @WOCKY_LIBS@
$< > $@
%-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 at enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G at Type@Value values[] = {" \
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 27553ae..80f350b 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,4 +1,3 @@
EXTRA_DIST = \
as-compiler-flag.m4 \
- compiler.m4 \
- shave.m4
+ compiler.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/src/Makefile.am b/src/Makefile.am
index 83363cc..142a841 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
BUILT_SOURCES = \
gabble-signals-marshal.h \
gabble-signals-marshal.c \
@@ -182,7 +180,7 @@ ALL_LIBS = @DBUS_LIBS@ @GLIB_LIBS@ @WOCKY_LIBS@ @TP_GLIB_LIBS@ \
# build gibber first
all: gibber
gibber:
- ${MAKE} -C $(top_builddir)/lib/gibber libgibber.la
+ @${MAKE} -C $(top_builddir)/lib/gibber libgibber.la
.PHONY: gibber
gabble-signals-marshal.list: $(libgabble_convenience_la_SOURCES) Makefile.am
@@ -197,16 +195,16 @@ gabble-signals-marshal.list: $(libgabble_convenience_la_SOURCES) Makefile.am
fi
%-signals-marshal.h: %-signals-marshal.list Makefile.am
- $(QUIET_GEN)glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $@
+ $(AM_V_GEN)glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $@
%-signals-marshal.c: %-signals-marshal.list Makefile.am
- $(QUIET_GEN){ echo '#include "$*-signals-marshal.h"' && \
+ $(AM_V_GEN){ echo '#include "$*-signals-marshal.h"' && \
glib-genmarshal --body --prefix=$(subst -,_,$*)_marshal $< ; \
} > $@
# 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 at _get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
@@ -214,7 +212,7 @@ gabble-signals-marshal.list: $(libgabble_convenience_la_SOURCES) Makefile.am
$< > $@
%-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 at enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G at Type@Value values[] = {" \
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 044779f..6c1b02d 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -181,8 +181,8 @@ check-twisted:
fi
config.py: Makefile
- echo "PACKAGE_STRING = \"$(PACKAGE_STRING)\"" > config.py
- if test -n ''$(ENABLE_DEBUG); then \
+ $(AM_V_GEN)echo "PACKAGE_STRING = \"$(PACKAGE_STRING)\"" > config.py
+ @if test -n ''$(ENABLE_DEBUG); then \
echo "DEBUGGING = True" >> config.py; \
else \
echo "DEBUGGING = False" >> config.py; \
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index 50aca34..efcff37 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -1,16 +1,16 @@
exec-with-log.sh: exec-with-log.sh.in
- sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
+ $(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
-e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" $< > $@
- chmod +x $@
+ @chmod +x $@
%.conf: %.conf.in
- sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+ $(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
# We don't use the full filename for the .in because > 99 character filenames
# in tarballs are non-portable (and automake 1.8 doesn't let us build
# non-archaic tarballs)
org.freedesktop.Telepathy.ConnectionManager.%.service: %.service.in
- sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+ $(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
# D-Bus service file for testing
service_in_files = gabble.service.in
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 520a83e..e83cb30 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
EXTRA_DIST = \
c-constants-gen.py \
check-coding-style.mk \
@@ -15,7 +13,6 @@ EXTRA_DIST = \
lcov.am \
libglibcodegen.py \
libtpcodegen.py \
- shave.mk \
telepathy.am \
xep.xsl
@@ -25,12 +22,12 @@ all: $(EXTRA_DIST)
libglibcodegen.py: libtpcodegen.py
test -e $@
- $(QUIET_GEN)touch $@
+ $(AM_V_GEN)touch $@
glib-ginterface-gen.py glib-gtypes-generator.py glib-interfaces-gen.py \
glib-signals-marshal-gen.py c-constants-gen.py: %: libglibcodegen.py
test -e $@
- $(QUIET_GEN)touch $@
+ $(AM_V_GEN)touch $@
maintainer-update-from-xmpp.org:
set -e; \
diff --git a/tools/shave.mk b/tools/shave.mk
deleted file mode 100644
index 53cb3bf..0000000
--- a/tools/shave.mk
+++ /dev/null
@@ -1 +0,0 @@
-QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
--
1.5.6.5
More information about the telepathy-commits
mailing list