[telepathy-gabble/master] Converted gabble to use shave and make make output legible.
Jonny Lamb
jonny.lamb at collabora.co.uk
Tue Apr 21 08:06:07 PDT 2009
Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
.gitignore | 2 +
configure.ac | 6 +++-
data/Makefile.am | 6 ++-
docs/Makefile.am | 6 ++-
extensions/Makefile.am | 20 +++++++-----
lib/gibber/Makefile.am | 12 ++++---
m4/Makefile.am | 3 +-
m4/shave.m4 | 77 ++++++++++++++++++++++++++++++++++++++++++++++
shave-libtool.in | 69 +++++++++++++++++++++++++++++++++++++++++
shave.in | 79 ++++++++++++++++++++++++++++++++++++++++++++++++
src/Makefile.am | 12 ++++---
tools/Makefile.am | 6 ++-
12 files changed, 271 insertions(+), 27 deletions(-)
create mode 100644 m4/shave.m4
create mode 100644 shave-libtool.in
create mode 100644 shave.in
diff --git a/.gitignore b/.gitignore
index 500617e..72c00a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,5 @@ cscope.out
/tests/twisted/tools/tmp-session-bus.conf
/tests/twisted/with-session-bus-*.pid
/tests/twisted/with-session-bus-*.address
+/shave
+/shave-libtool
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index f02e4a0..ee12af8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,6 +206,8 @@ fi
AC_CHECK_FUNCS(getifaddrs memset select strndup setresuid setreuid strerror)
+SHAVE_INIT(.)
+
AC_OUTPUT( Makefile \
docs/Makefile \
extensions/Makefile \
@@ -217,5 +219,7 @@ AC_OUTPUT( Makefile \
tests/twisted/Makefile \
tests/twisted/tools/Makefile \
lib/Makefile \
- lib/gibber/Makefile
+ lib/gibber/Makefile \
+ shave \
+ shave-libtool
)
diff --git a/data/Makefile.am b/data/Makefile.am
index 12579c4..eb9cde7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,5 @@
+QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
+
EXTRA_DIST = gabble.service.in
managerdir = $(datadir)/telepathy/managers
@@ -11,10 +13,10 @@ service_DATA = org.freedesktop.Telepathy.ConnectionManager.gabble.service
# non-archaic tarballs)
org.freedesktop.Telepathy.ConnectionManager.gabble.service: gabble.service.in \
Makefile
- @sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
+ $(QUIET_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
- ../src/write-mgr-file > $@
+ $(QUIET_GEN)../src/write-mgr-file > $@
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 9347799..b97f184 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,3 +1,5 @@
+QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
+
tools_dir = $(top_srcdir)/tools
# htmldir is not defined by autoconf < 2.59c
@@ -19,10 +21,10 @@ CLEANFILES = \
$(html_DATA)
%.8: %.8.in Makefile
- sed -e 's,[@]libexecdir[@], at libexecdir@,' < $< > $@
+ $(QUIET_GEN)sed -e 's,[@]libexecdir[@], at libexecdir@,' < $< > $@
$(html_DATA): %.html: %.xml $(tools_dir)/xep.xsl
- $(XSLTPROC) $(tools_dir)/xep.xsl $< > $@
+ $(QUIET_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 a7574ea..3f7bec9 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,3 +1,5 @@
+QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
+
tools_dir = $(top_srcdir)/tools
EXTRA_DIST = \
@@ -52,18 +54,18 @@ XSLTPROCFLAGS = --nonet --novalid
_gen/all.xml: all.xml $(wildcard *.xml) Makefile.am
$(mkdir_p) _gen
- $(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
+ $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
$< > $@
extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl Makefile.am
- $(XSLTPROC) $(XSLTPROCFLAGS) \
+ $(QUIET_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
- $(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+ $(QUIET_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"' \
@@ -74,26 +76,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
- $(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
+ $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
_gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am
- $(GLIB_GENMARSHAL) --header --prefix=_gabble_ext_marshal $< > $@
+ $(QUIET_GEN)$(GLIB_GENMARSHAL) --header --prefix=_gabble_ext_marshal $< > $@
_gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am
- { echo '#include "_gen/signals-marshal.h"' && \
+ $(QUIET_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
- $(PYTHON) $(tools_dir)/c-constants-gen.py Gabble $< > $@
+ $(QUIET_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
- $(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
+ $(QUIET_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
- $(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
+ $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
$< _gen/gtypes Gabble
diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am
index 77c530b..edd9ffe 100644
--- a/lib/gibber/Makefile.am
+++ b/lib/gibber/Makefile.am
@@ -1,3 +1,5 @@
+QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
+
noinst_LTLIBRARIES = libgibber.la
BUILT_SOURCES = \
@@ -45,7 +47,7 @@ dist-hook:
$(shell for x in $(BUILT_SOURCES); do rm -f $(distdir)/$$x ; done)
gibber-signals-marshal.list: $(OUR_SOURCES) Makefile.am
- ( cd $(srcdir) && \
+ $(QUIET_GEN)( cd $(srcdir) && \
sed -n -e 's/.*_gibber_signals_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
$(OUR_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
@@ -57,10 +59,10 @@ gibber-signals-marshal.list: $(OUR_SOURCES) Makefile.am
fi
%-signals-marshal.h: %-signals-marshal.list Makefile.am
- glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@
+ $(QUIET_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@
%-signals-marshal.c: %-signals-marshal.list Makefile.am
- { echo '#include "$*-signals-marshal.h"' && \
+ $(QUIET_GEN){ echo '#include "$*-signals-marshal.h"' && \
glib-genmarshal --body --prefix=_$(subst -,_,$*)_signals_marshal $< ; \
} > $@
@@ -71,7 +73,7 @@ AM_LDFLAGS = $(GCOV_LIBS) @GLIB_LIBS@ @RESOLV_LIBS@
# rules for making the glib enum objects
%-enumtypes.h: %.h Makefile.in
- glib-mkenums \
+ $(QUIET_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" \
@@ -79,7 +81,7 @@ AM_LDFLAGS = $(GCOV_LIBS) @GLIB_LIBS@ @RESOLV_LIBS@
$< > $@
%-enumtypes.c: %.h Makefile.in
- glib-mkenums \
+ $(QUIET_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 80f350b..27553ae 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,3 +1,4 @@
EXTRA_DIST = \
as-compiler-flag.m4 \
- compiler.m4
+ compiler.m4 \
+ shave.m4
diff --git a/m4/shave.m4 b/m4/shave.m4
new file mode 100644
index 0000000..0a3509e
--- /dev/null
+++ b/m4/shave.m4
@@ -0,0 +1,77 @@
+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
new file mode 100644
index 0000000..1f3a720
--- /dev/null
+++ b/shave-libtool.in
@@ -0,0 +1,69 @@
+#!/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
new file mode 100644
index 0000000..5c16f27
--- /dev/null
+++ b/shave.in
@@ -0,0 +1,79 @@
+#!/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 f550dc4..3b34bca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
+
BUILT_SOURCES = \
gabble-signals-marshal.h \
gabble-signals-marshal.c \
@@ -173,7 +175,7 @@ $(top_builddir)/lib/gibber/libgibber.la:
.PHONY: $(top_builddir)/lib/gibber/libgibber.la
gabble-signals-marshal.list: $(libgabble_convenience_la_SOURCES) Makefile.am
- @( cd $(srcdir) && \
+ $(QUIET_GEN)( cd $(srcdir) && \
sed -n -e 's/.*gabble_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
$(libgabble_convenience_la_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
@@ -184,16 +186,16 @@ gabble-signals-marshal.list: $(libgabble_convenience_la_SOURCES) Makefile.am
fi
%-signals-marshal.h: %-signals-marshal.list Makefile.am
- glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $@
+ $(QUIET_GEN)glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $@
%-signals-marshal.c: %-signals-marshal.list Makefile.am
- { echo '#include "$*-signals-marshal.h"' && \
+ $(QUIET_GEN){ echo '#include "$*-signals-marshal.h"' && \
glib-genmarshal --body --prefix=$(subst -,_,$*)_marshal $< ; \
} > $@
# rules for making the glib enum objects
%-enumtypes.h: %.h Makefile.in
- glib-mkenums \
+ $(QUIET_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" \
@@ -201,7 +203,7 @@ gabble-signals-marshal.list: $(libgabble_convenience_la_SOURCES) Makefile.am
$< > $@
%-enumtypes.c: %.h Makefile.in
- glib-mkenums \
+ $(QUIET_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/tools/Makefile.am b/tools/Makefile.am
index f61a9f4..9c2328d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,3 +1,5 @@
+QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
+
EXTRA_DIST = \
c-constants-gen.py \
check-coding-style.mk \
@@ -22,12 +24,12 @@ all: $(EXTRA_DIST)
libglibcodegen.py: libtpcodegen.py
test -e $@
- touch $@
+ $(QUIET_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 $@
- touch $@
+ $(QUIET_GEN)touch $@
maintainer-update-from-xmpp.org:
set -e; \
--
1.5.6.5
More information about the telepathy-commits
mailing list