summaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2010-01-24 12:16:29 +0000
committerJonny Lamb <jonny.lamb@collabora.co.uk>2010-01-24 12:16:29 +0000
commit2811429b5ab324f5c203233ecb34783c2f4dfaa4 (patch)
tree9f4fb40906490230faf878e5fb14afc38901fff8 /tests/Makefile.am
parent3983d2c6f16a1a6c30494ea1b5a84e7db7c1a3e5 (diff)
downloadtelepathy-haze-2811429b5ab324f5c203233ecb34783c2f4dfaa4.tar.gz
shave: remove and replace with automake 1.11's silent rules support
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2e75e17..edb1084 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/tools/shave.mk
-
SUBDIRS = .
if WANT_TWISTED_TESTS
@@ -7,13 +5,13 @@ SUBDIRS += twisted
endif
%.conf: %.conf.in
- $(QUIET_GEN)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
- $(QUIET_GEN)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" $< > $@
# D-Bus service file for testing