summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore3
-rw-r--r--configure.ac4
-rw-r--r--data/Makefile.am6
-rw-r--r--docs/Makefile.am6
-rw-r--r--extensions/Makefile.am24
-rw-r--r--lib/gibber/Makefile.am12
-rw-r--r--lib/gibber/examples/Makefile.am4
-rw-r--r--m4/shave.m477
-rw-r--r--shave-libtool.in69
-rw-r--r--shave.in79
-rw-r--r--src/Makefile.am14
-rw-r--r--tests/twisted/Makefile.am4
-rw-r--r--tests/twisted/tools/Makefile.am8
-rw-r--r--tools/Makefile.am14
-rw-r--r--tools/shave.mk1
15 files changed, 37 insertions, 288 deletions
diff --git a/.gitignore b/.gitignore
index 5109f759..890c0a06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,6 +135,3 @@ lib/gibber/tests/outputs
lib/gibber/tests/sasl-test.db
lib/gibber/tests/test-xmpp-connection
lib/gibber/tests/test-r-multicast-transport-io
-
-/shave
-/shave-libtool
diff --git a/configure.ac b/configure.ac
index 4a0f1c59..66e96c69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,8 +302,6 @@ AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
AC_SUBST(PACKAGE_STRING)
-SHAVE_INIT(.)
-
AC_OUTPUT( Makefile \
docs/Makefile \
lib/Makefile \
@@ -319,6 +317,4 @@ AC_OUTPUT( Makefile \
tests/Makefile \
tests/twisted/Makefile \
tests/twisted/tools/Makefile \
- shave \
- shave-libtool \
)
diff --git a/data/Makefile.am b/data/Makefile.am
index a76fe50d..3504d644 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
EXTRA_DIST = salut.service.in
managerdir = $(datadir)/telepathy/managers
@@ -13,12 +11,12 @@ service_DATA = org.freedesktop.Telepathy.ConnectionManager.salut.service
# non-archaic tarballs)
org.freedesktop.Telepathy.ConnectionManager.salut.service: salut.service.in \
Makefile
- $(QUIET_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
+ @sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
CLEANFILES = $(service_DATA) $(manager_DATA)
$(manager_DATA): always-build
$(MAKE) -C ../src write-mgr-file
- $(QUIET_GEN)../src/write-mgr-file > $@
+ ../src/write-mgr-file > $@
.PHONY: always-build
diff --git a/docs/Makefile.am b/docs/Makefile.am
index ea5aba69..f5608c38 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
tools_dir = $(top_srcdir)/tools
man_MANS = telepathy-salut.8
@@ -14,10 +12,10 @@ CLEANFILES = \
$(html_DATA)
%.8: %.8.in Makefile
- $(QUIET_GEN)sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@
+ sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@
$(html_DATA): %.html: %.xml $(tools_dir)/xep.xsl
- $(QUIET_GEN)$(XSLTPROC) $(tools_dir)/xep.xsl $< > $@
+ $(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 f18c3de7..a32ff9d7 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,45 +48,45 @@ XSLTPROCFLAGS = --nonet --novalid
_gen/%.xml: %.xml $(wildcard *.xml) $(tools_dir)/identity.xsl
$(mkdir_p) _gen
- $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
+ $(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
$< > $@
extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
- $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude \
+ $(XSLTPROC) $(XSLTPROCFLAGS) --xinclude \
$(tools_dir)/doc-generator.xsl \
$< > $@
_gen/signals-marshal.list: _gen/all.xml \
$(tools_dir)/glib-signals-marshal-gen.py
- $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
+ $(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
_gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am
- $(QUIET_GEN)$(GLIB_GENMARSHAL) --header --prefix=_salut_ext_marshal $< > $@
+ $(GLIB_GENMARSHAL) --header --prefix=_salut_ext_marshal $< > $@
_gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am
- $(QUIET_GEN){ echo '#include "_gen/signals-marshal.h"' && \
+ { echo '#include "_gen/signals-marshal.h"' && \
$(GLIB_GENMARSHAL) --body --prefix=_salut_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 $< \
+ $(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
_salut_ext > $@
_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-generator.xsl
- $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
+ $(XSLTPROC) $(XSLTPROCFLAGS) \
--stringparam mixed-case-prefix Salut \
$(tools_dir)/c-constants-generator.xsl \
$< > $@
_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 \
+ $(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
$< _gen/gtypes Salut
_gen/interfaces.h: _gen/all.xml \
$(tools_dir)/glib-interfaces-generator.xsl \
$(tools_dir)/c-interfaces-generator.xsl
- $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
+ $(XSLTPROC) $(XSLTPROCFLAGS) \
--stringparam mixed-case-prefix Salut \
$(tools_dir)/glib-interfaces-generator.xsl \
$< > $@
@@ -96,13 +94,13 @@ _gen/interfaces.h: _gen/all.xml \
_gen/interfaces-body.h: _gen/all.xml \
$(tools_dir)/glib-interfaces-body-generator.xsl \
$(tools_dir)/c-interfaces-generator.xsl
- $(QUIET_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
+ $(XSLTPROC) $(XSLTPROCFLAGS) \
--stringparam mixed-case-prefix Salut \
$(tools_dir)/glib-interfaces-body-generator.xsl \
$< > $@
_gen/svc.c _gen/svc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py
- $(QUIET_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+ $(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
--filename=_gen/svc \
--signal-marshal-prefix=_salut_ext \
--include='<telepathy-glib/dbus.h>' \
diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am
index ed472fb0..bec4168b 100644
--- a/lib/gibber/Makefile.am
+++ b/lib/gibber/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
SUBDIRS = examples tests
noinst_LTLIBRARIES = libgibber.la
@@ -111,7 +109,7 @@ dist-hook:
$(shell for x in $(BUILT_SOURCES); do rm -f $(distdir)/$$x ; done)
gibber-signals-marshal.list: $(HANDWRITTEN_SOURCES) Makefile.am
- $(QUIET_GEN)( cd $(srcdir) && \
+ ( cd $(srcdir) && \
sed -n -e 's/.*_gibber_signals_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
$(HANDWRITTEN_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
@@ -122,10 +120,10 @@ gibber-signals-marshal.list: $(HANDWRITTEN_SOURCES) Makefile.am
fi
%-signals-marshal.h: %-signals-marshal.list Makefile.am
- $(QUIET_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@
+ glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@
%-signals-marshal.c: %-signals-marshal.list Makefile.am
- $(QUIET_GEN){ echo '#include "$*-signals-marshal.h"' && \
+ { echo '#include "$*-signals-marshal.h"' && \
glib-genmarshal --body --prefix=_$(subst -,_,$*)_signals_marshal $< ; \
} > $@
@@ -152,7 +150,7 @@ endif
# rules for making the glib enum objects
%-enumtypes.h: %.h Makefile.in
- $(QUIET_GEN)glib-mkenums \
+ glib-mkenums \
--fhead "#ifndef __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | LC_ALL=C 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@_get_type (void);\n#define $(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
@@ -160,7 +158,7 @@ endif
$< > $@
%-enumtypes.c: %.h Makefile.in
- $(QUIET_GEN)glib-mkenums \
+ glib-mkenums \
--fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
diff --git a/lib/gibber/examples/Makefile.am b/lib/gibber/examples/Makefile.am
index 153ff992..7e537d75 100644
--- a/lib/gibber/examples/Makefile.am
+++ b/lib/gibber/examples/Makefile.am
@@ -1,11 +1,9 @@
-include $(top_srcdir)/tools/shave.mk
-
# All examples use SSL, so don't build anything if it's unavailable
if HAVE_LIBSSL
# Teach it how to make libgibber.la
$(top_builddir)/lib/gibber/libgibber.la:
- $(QUIET_GEN)${MAKE} -C $(top_builddir)/lib/gibber libgibber.la
+ ${MAKE} -C $(top_builddir)/lib/gibber libgibber.la
.PHONY: $(top_builddir)/lib/gibber/libgibber.la
diff --git a/m4/shave.m4 b/m4/shave.m4
deleted file mode 100644
index 0a3509e5..00000000
--- a/m4/shave.m4
+++ /dev/null
@@ -1,77 +0,0 @@
-dnl Make automake/libtool output more friendly to humans
-dnl Damien Lespiau <damien.lespiau@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 1f3a720c..00000000
--- 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 5c16f27a..00000000
--- 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 b5953150..cd7fc494 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
BUILT_SOURCES = \
salut-signals-marshal.list \
salut-signals-marshal.h \
@@ -171,12 +169,12 @@ AM_LDFLAGS = $(GCOV_LIBS) @DBUS_LIBS@ \
# Teach it how to make libgibber.la
$(top_builddir)/lib/gibber/libgibber.la:
- $(QUIET_GEN)${MAKE} -C $(top_builddir)/lib/gibber libgibber.la
+ ${MAKE} -C $(top_builddir)/lib/gibber libgibber.la
.PHONY: $(top_builddir)/lib/gibber/libgibber.la
salut-signals-marshal.list: $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BACKEND_SOURCES) Makefile.am
- $(QUIET_GEN)( cd $(srcdir) && \
+ ( cd $(srcdir) && \
sed -n -e 's/.*salut_signals_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
$(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BACKEND_SOURCES) ) \
| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
@@ -187,16 +185,16 @@ salut-signals-marshal.list: $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BAC
fi
%-signals-marshal.h: %-signals-marshal.list Makefile.am
- $(QUIET_GEN)glib-genmarshal --header --prefix=$(subst -,_,$*)_signals_marshal $< > $@
+ glib-genmarshal --header --prefix=$(subst -,_,$*)_signals_marshal $< > $@
%-signals-marshal.c: %-signals-marshal.list Makefile.am
- $(QUIET_GEN){ echo '#include "$*-signals-marshal.h"' && \
+ { echo '#include "$*-signals-marshal.h"' && \
glib-genmarshal --body --prefix=$(subst -,_,$*)_signals_marshal $< ; \
} > $@
# rules for making the glib enum objects
%-enumtypes.h: %.h Makefile.in
- $(QUIET_GEN)glib-mkenums \
+ glib-mkenums \
--fhead "#ifndef __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | LC_ALL=C 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@_get_type (void);\n#define $(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
@@ -204,7 +202,7 @@ salut-signals-marshal.list: $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BAC
$< > $@
%-enumtypes.c: %.h Makefile.in
- $(QUIET_GEN)glib-mkenums \
+ glib-mkenums \
--fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index dc21561d..5a46a38e 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
TWISTED_TESTS =
TWISTED_BASIC_TESTS =
@@ -86,7 +84,7 @@ check-twisted:
fi
config.py: Makefile
- $(QUIET_GEN)echo "PACKAGE_STRING = \"$(PACKAGE_STRING)\"" > config.py
+ echo "PACKAGE_STRING = \"$(PACKAGE_STRING)\"" > config.py
BUILT_SOURCES = config.py
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index b042cb00..d4459b47 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -1,17 +1,15 @@
-include $(top_srcdir)/tools/shave.mk
-
exec-with-log.sh: exec-with-log.sh.in
- $(QUIET_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+ sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
chmod +x $@
%.conf: %.conf.in
- $(QUIET_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+ 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
- $(QUIET_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+ sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
# D-Bus service file for testing
service_in_files = salut.service.in
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ba46cda9..1ebea7ef 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
EXTRA_DIST = \
c-constants-generator.xsl \
c-interfaces-generator.xsl \
@@ -21,18 +19,18 @@ EXTRA_DIST = \
xep.xsl
glib-client-marshaller-gen.py: libglibcodegen.py
- $(QUIET_GEN)touch $@
+ touch $@
glib-ginterface-gen.py: libglibcodegen.py
- $(QUIET_GEN)touch $@
+ touch $@
glib-gtypes-generator.py: libglibcodegen.py
- $(QUIET_GEN)touch $@
+ touch $@
glib-signals-marshal-gen.py: libglibcodegen.py
- $(QUIET_GEN)touch $@
+ touch $@
glib-interfaces-generator.xsl: c-interfaces-generator.xsl
- $(QUIET_GEN)touch $@
+ touch $@
glib-interfaces-body-generator.xsl: c-interfaces-generator.xsl
- $(QUIET_GEN)touch $@
+ touch $@
maintainer-update-from-xmpp.org:
set -e; \
diff --git a/tools/shave.mk b/tools/shave.mk
deleted file mode 100644
index 53cb3bf5..00000000
--- a/tools/shave.mk
+++ /dev/null
@@ -1 +0,0 @@
-QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
View Lorry Controller Status