summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2007-04-22 08:18:40 +0000
committerJean Delvare <khali@linux-fr.org>2007-04-22 08:18:40 +0000
commitaa2a64092c5d349ec3b7006f615860289c1597ab (patch)
tree9af0c05db4aa6217ab32154d1925b4559bc68ddb
parentfc41123a1b56b3d93ae83432b23bb10e67ae96bb (diff)
downloadquilt-aa2a64092c5d349ec3b7006f615860289c1597ab.tar.gz
Dependencies of quilt/* on quilt/scripts/* are run-time dependencies for
the test suite, not build-time dependencies.
-rw-r--r--Makefile.in9
-rw-r--r--quilt.changes8
2 files changed, 13 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 08767e5..afe5586 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -376,8 +376,6 @@ ifneq ($(findstring test,$(MAKECMDGOALS))$(findstring check,$(MAKECMDGOALS)),)
-include test/.depend
endif # (test|check)
-quilt/refresh :: quilt/scripts/remove-trailing-ws
-quilt/mail :: quilt/scripts/edmail
test/.patch-wrapper.ok : bin/patch-wrapper
# Include a run-time generated list of dependencies for each test case
@@ -387,7 +385,12 @@ test/.depend : Makefile $(TESTS)
{ print FILENAME, ":", "quilt/"$$1}' $(TESTS); \
$(AWK) 'sub(/.*\<quilt_command /, "") && ($$1 !~ /[^a-z]/) \
{ print FILENAME, ":", "quilt/"$$1 }' quilt/*.in; \
- ) | sort -u | $(SED) -re 's:^test/(.*)\.test:test/.\1.ok:' > $@
+ ) | sort -u | $(SED) -re 's:^test/(.*)\.test:test/.\1.ok:' \
+ -e 's:quilt/graph:quilt/graph quilt/scripts/dependency-graph:' \
+ -e 's:quilt/mail:quilt/mail quilt/scripts/edmail:' \
+ -e 's:quilt/refresh:quilt/refresh quilt/scripts/remove-trailing-ws:' \
+ -e 's:quilt/setup:quilt/setup quilt/scripts/inspect:' \
+ > $@
ifneq ($(shell . $(QUILTRC) ; echo $$QUILT_PATCHES_PREFIX),)
CHECK_ENV := P=patches/; _P=../patches/; export P _P
diff --git a/quilt.changes b/quilt.changes
index 46a2ad0..051c552 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Sun Apr 22 10:13:18 CEST 2007 - khali@linux-fr.org
+
+- Dependencies of quilt/* on quilt/scripts/* are run-time
+ dependencies for the test suite, not build-time dependencies.
+
+-------------------------------------------------------------------
Fri Apr 20 01:13:49 CEST 2007 - agruen@suse.de
- quilt mail: Allow to specify a patch range.
@@ -19,7 +25,7 @@ Mon Apr 16 06:10:18 CEST 2007 - agruen@suse.de
- lib/backup-files.c: Do not modify the original file whenever
possible: previously, a ``quilt add'' usually linked the file
- to he backup and then copied the backup over the file to ensure
+ to the backup and then copied the backup over the file to ensure
a link count of one. Recognize this case, and create a copy in
the first place instead.