test regeneration after a -included .in file changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/example/.gitignore b/example/.gitignore
index 07064fccadc1a2f65f36a1b264fde48431745e99..a97b4139b7dd13da6ec8ca4275dd43f9c2dc7765 100644 (file)
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -27,3 +27,4 @@ Subdir.mk
 #----- For our tests -----
 /build
 /src/for-test.sd.mk
+/lib/for-test.mk.in

diff --git a/example/configure.ac b/example/configure.ac
index 88516fbacb3c26a5d1a1f2d811052f83f110cb7e..8d3496b68a42f7ea0d728830abf33fc02c2a04e3 100644 (file)
--- a/example/configure.ac
+++ b/example/configure.ac
@@ -19,6 +19,10 @@ m4_include([subdirmk/subdirmk.ac])
 SUBDIRMK_SUBDIRS([lib])
 SUBDIRMK_SUBDIRS([lib/t src])
 
+if test -f $srcdir/lib/for-test.mk.in; then
+   SUBDIRMK_MAKEFILES([lib/for-test.mk])
+fi
+
 AC_OUTPUT
 
 dnl----- That's all, folks --------------------------------------------------

diff --git a/example/lib/Subdir.sd.mk b/example/lib/Subdir.sd.mk
index fa40cfd0d6b8c4e2bb26c0fe02da9b224653dfad..c2939c54457ebe992e86b2a244e0550391d4aab4 100644 (file)
--- a/example/lib/Subdir.sd.mk
+++ b/example/lib/Subdir.sd.mk
@@ -9,3 +9,5 @@
 
 &libtoy.a:     $(&OBJECTS)
        $(AR) rc $@ $^
+
+-include &^/lib/for-test.mk

diff --git a/tests/check b/tests/check
index 7465c2c88e1220ea4b40a9c3c2965c422311c1fc..f0914dd597e456fd0a14287f1bb73d6834bcd44a 100755 (executable)
--- a/tests/check
+++ b/tests/check
@@ -12,6 +12,7 @@ git clean -xdff
 mkdir build
 cd build
 >>../src/for-test.sd.mk
+>>../lib/for-test.mk.in
 .././autogen.sh && ../configure
 make -j4 all check
 
@@ -19,4 +20,8 @@ echo '# for-check 1' >>../src/for-test.sd.mk
 make -j4
 grep '^# for-check 1' src/Subdir.mk || false
 
+echo '# for-check 2' >>../lib/for-test.mk.in
+make -j4
+grep '^# for-check 2' lib/for-test.mk || false
+
 echo ok.