From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Nov 2019 00:39:24 +0000 (+0000)
Subject: build system: Use SUBDIRMK_MAKEFILES for common.make etc.
X-Git-Tag: v0.5.1~36
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=3453191fec21c6ef4cb34af45a252df69ce750fc

build system: Use SUBDIRMK_MAKEFILES for common.make etc.

This wires them properly into regen.mk.

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

diff --git a/configure b/configure
index 6f8d498..67aabce 100755
--- a/configure
+++ b/configure
@@ -4712,7 +4712,18 @@ else
 $as_echo "$as_me: WARNING: Disabling IPv6 support" >&2;}
 fi
 
-ac_config_files="$ac_config_files common.make test-common.make test-example/Makefile stest/Makefile mtest/Makefile"
+
+
+  _SUBDIRMK_MAKEFILES="$_SUBDIRMK_MAKEFILES common.make"
+  ac_config_files="$ac_config_files common.make:common.make.in"
+
+
+  _SUBDIRMK_MAKEFILES="$_SUBDIRMK_MAKEFILES test-common.make"
+  ac_config_files="$ac_config_files test-common.make:test-common.make.in"
+
+
+
+ac_config_files="$ac_config_files stest/Makefile mtest/Makefile"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -5423,9 +5434,8 @@ do
     "Subdir.mk") CONFIG_FILES="$CONFIG_FILES Subdir.mk:Subdir.mk.tmp" ;;
     "subdirmk/regen.mk") CONFIG_FILES="$CONFIG_FILES subdirmk/regen.mk:subdirmk/regen.mk.in" ;;
     "subdirmk/usual.mk") CONFIG_FILES="$CONFIG_FILES subdirmk/usual.mk:subdirmk/usual.mk.in" ;;
-    "common.make") CONFIG_FILES="$CONFIG_FILES common.make" ;;
-    "test-common.make") CONFIG_FILES="$CONFIG_FILES test-common.make" ;;
-    "test-example/Makefile") CONFIG_FILES="$CONFIG_FILES test-example/Makefile" ;;
+    "common.make") CONFIG_FILES="$CONFIG_FILES common.make:common.make.in" ;;
+    "test-common.make") CONFIG_FILES="$CONFIG_FILES test-common.make:test-common.make.in" ;;
     "stest/Makefile") CONFIG_FILES="$CONFIG_FILES stest/Makefile" ;;
     "mtest/Makefile") CONFIG_FILES="$CONFIG_FILES mtest/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
diff --git a/configure.ac b/configure.ac
index 9c65460..2764671 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,8 +99,9 @@ else
     AC_MSG_WARN([Disabling IPv6 support])
 fi
 
-AC_OUTPUT(common.make test-common.make
-          test-example/Makefile stest/Makefile mtest/Makefile,
+SUBDIRMK_MAKEFILES(common.make test-common.make)
+
+AC_OUTPUT(stest/Makefile mtest/Makefile,
           echo timestamp >config.stamp)
 
 AH_TOP([