chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
subdirmk: Merge new version and fix everything
[secnet.git]
/
subdirmk
/
subdirmk.ac
diff --git
a/subdirmk/subdirmk.ac
b/subdirmk/subdirmk.ac
index bacd1cfa64dae69b4c5f9854b5fbea714bfa5795..93c77d9459d9c1358538f8d88c2408a6dd80e70b 100644
(file)
--- a/
subdirmk/subdirmk.ac
+++ b/
subdirmk/subdirmk.ac
@@
-3,6
+3,7
@@
dnl subdirmk - autoconf macros
dnl Copyright 2019 Mark Wooding
dnl Copyright 2019 Ian Jackson
dnl SPDX-License-Identifier: LGPL-2.0-or-later
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])
_SUBDIRMK_MAKEFILES=""
AC_SUBST([_SUBDIRMK_MAKEFILES])
@@
-14,7
+15,8
@@
m4_map_args_w([$1],[_SUBDIRMK_SUBDIR(],[/)])])dnl
AC_DEFUN_ONCE([_SUBDIRMK_INIT],[
AC_CONFIG_FILES([
main.mk:main.mk.tmp
AC_DEFUN_ONCE([_SUBDIRMK_INIT],[
AC_CONFIG_FILES([
main.mk:main.mk.tmp
- Subdir.mk:Subdir.mk.tmp
+ Dir.mk:Dir.mk.tmp
+ Final.mk:Final.mk.tmp
],[],[
'$srcdir'/subdirmk/generate --srcdir='$srcdir' $subdirmk_subdirs
])
],[],[
'$srcdir'/subdirmk/generate --srcdir='$srcdir' $subdirmk_subdirs
])
@@
-23,7
+25,7
@@
AC_DEFUN_ONCE([_SUBDIRMK_INIT],[
AC_DEFUN([_SUBDIRMK_SUBDIR],[
subdirmk_subdirs="$subdirmk_subdirs '$1'"
AC_DEFUN([_SUBDIRMK_SUBDIR],[
subdirmk_subdirs="$subdirmk_subdirs '$1'"
- AC_CONFIG_FILES([$1
Subdir.mk:$1Subd
ir.mk.tmp])
+ AC_CONFIG_FILES([$1
Dir.mk:$1D
ir.mk.tmp])
])
AC_DEFUN([SUBDIRMK_MAKEFILES],
])
AC_DEFUN([SUBDIRMK_MAKEFILES],