summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2012-09-11 10:30:36 +0200
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-09-11 11:20:34 +0100
commite3aae2b2143c8b851e5814f6711aff75d4a1d197 (patch)
treea9de1c605b1ca7c3eaa8bc2fd977d0a0dc7ed4a9
parent217f39faabeece4946030ea14b6f26bda40fa276 (diff)
Make the installed file generation depend on Makefile
Make the rules for generating files part of the installed tests depend on the Makefile such that it gets regenerated after runing configure with a different prefix
-rw-r--r--tests/twisted/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index bf7552c24..ba5dcad68 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -446,13 +446,13 @@ include $(top_srcdir)/tools/check-coding-style.mk
gabble-twisted-tests.list:
$(AM_V_GEN)echo $(TWISTED_TESTS) > $@
-run-test.sh: run-test.sh.in
+run-test.sh: run-test.sh.in Makefile
$(AM_V_GEN)sed -e "s|[@]gabbletestsdir[@]|@gabbletestsdir@|g" \
-e "s|[@]PYTHON[@]|$(PYTHON)|g" \
$< > $@
@chmod +x $@
-tools/run-gabble.sh: tools/run-gabble.sh.in
+tools/run-gabble.sh: tools/run-gabble.sh.in Makefile
@mkdir -p tools
$(AM_V_GEN)sed \
-e "s|[@]gabbletestsdir[@]|@gabbletestsdir@|g" \
@@ -468,7 +468,7 @@ tools/exec-with-log.sh: tools/exec-with-log.sh.in
@chmod +x $@
# The wildcard % matches both config files!
-tools/%.conf: tools/%.conf.in
+tools/%.conf: tools/%.conf.in Makefile
$(MKDIR_P) tools
$(AM_V_GEN)sed -e "s|[@]gabbletestsdir[@]|@gabbletestsdir@|g" \
-e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
@@ -476,7 +476,7 @@ tools/%.conf: tools/%.conf.in
# 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)
-tools/servicedir/org.freedesktop.Telepathy.ConnectionManager.%.service: tools/servicedir/%.service.in
+tools/servicedir/org.freedesktop.Telepathy.ConnectionManager.%.service: tools/servicedir/%.service.in Makefile
$(MKDIR_P) tools/servicedir
$(AM_V_GEN)sed -e "s|[@]gabbletestsdir[@]|@gabbletestsdir@|g" $< > $@