X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=subdirmk%2Fsubdirmk.ac;h=93c77d9459d9c1358538f8d88c2408a6dd80e70b;hb=16bce837ffe3527d4e8ed306f4436a86891d6e60;hp=24e6d14fa5a772a3bfa8c1a1c48dadf91d7d84a9;hpb=47bbde5189c25e9a43c821d7c1db3d88a63eeafd;p=secnet.git

diff --git a/subdirmk/subdirmk.ac b/subdirmk/subdirmk.ac
index 24e6d14..93c77d9 100644
--- a/subdirmk/subdirmk.ac
+++ b/subdirmk/subdirmk.ac
@@ -1,29 +1,38 @@
+dnl -*-autoconf-*-
+dnl subdirmk - autoconf macros
+dnl  Copyright 2019 Mark Wooding
+dnl  Copyright 2019 Ian Jackson
+dnl SPDX-License-Identifier: LGPL-2.0-or-later
+dnl There is NO WARRANTY.
+
+_SUBDIRMK_MAKEFILES=""
+AC_SUBST([_SUBDIRMK_MAKEFILES])
 
 AC_DEFUN([SUBDIRMK_SUBDIRS],
-[m4_map_args_w([$1],[_SUBDIRMK_SUBDIR(],[/)])])dnl
+[_SUBDIRMK_INIT
+m4_map_args_w([$1],[_SUBDIRMK_SUBDIR(],[/)])])dnl
 
 AC_DEFUN_ONCE([_SUBDIRMK_INIT],[
   AC_CONFIG_FILES([
 	main.mk:main.mk.tmp
-	Subdir.mk:Subdir.mk.tmp
-	subdirmk/regen.mk
+	Dir.mk:Dir.mk.tmp
+	Final.mk:Final.mk.tmp
 	],[],[
-    subdirsmk_need_prep=false
-    AS_IF([\$ac_need_defaults],[
-      subdirsmk_need_prep=true],[
-      AS_CASE([" \$ac_config_targets "],[*" subdirs.mk "*],[
-	subdirsmk_need_prep=true
-      ])
-    ])
-    AS_IF([\$subdirsmk_need_prep],[
-      echo 'running subdirmk/generate'
-     '$srcdir'/subdirmk/generate --srcdir '$srcdir' $subdirsmk_subdirs
-    ])
+     '$srcdir'/subdirmk/generate --srcdir='$srcdir' $subdirmk_subdirs
   ])
+  SUBDIRMK_MAKEFILES([subdirmk/regen.mk subdirmk/usual.mk])
 ])
 
 AC_DEFUN([_SUBDIRMK_SUBDIR],[
-  AC_REQUIRE([_SUBDIRMK_INIT])
-  subdirsmk_subdirs="$subdirsmk_subdirs '$1'"
-  AC_CONFIG_FILES([$1Subdir.mk:$1Subdir.mk.tmp])
+  subdirmk_subdirs="$subdirmk_subdirs '$1'"
+  AC_CONFIG_FILES([$1Dir.mk:$1Dir.mk.tmp])
+])
+
+AC_DEFUN([SUBDIRMK_MAKEFILES],
+[_SUBDIRMK_INIT
+m4_map_args_w([$1],[_SUBDIRMK_MAKEFILE(],[)])])dnl
+
+AC_DEFUN([_SUBDIRMK_MAKEFILE],[
+  _SUBDIRMK_MAKEFILES="$_SUBDIRMK_MAKEFILES $1"
+  AC_CONFIG_FILES([$1:$1.in])
 ])