From 4c223d7528029763cb4afd0682fa950d83f50f61 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 13 Nov 2019 22:56:45 +0000 Subject: [PATCH] test regeneration after a -included .in file changes Signed-off-by: Ian Jackson --- example/.gitignore | 1 + example/configure.ac | 4 ++++ example/lib/Subdir.sd.mk | 2 ++ tests/check | 5 +++++ 4 files changed, 12 insertions(+) diff --git a/example/.gitignore b/example/.gitignore index 07064fc..a97b413 100644 --- 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 88516fb..8d3496b 100644 --- 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 fa40cfd..c2939c5 100644 --- 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 7465c2c..f0914dd 100755 --- 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. -- 2.30.2