chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
realclean: Use @_SUBDIRMK_MAKEFILES@
[secnet.git]
/
subdirmk
/
regen.mk.in
diff --git
a/subdirmk/regen.mk.in
b/subdirmk/regen.mk.in
index eb54fc3f7353bf50ee60fc6400407178e66fe495..a6d9ad2544837b83b5d2ee2386b1328fe69cb430 100644
(file)
--- a/
subdirmk/regen.mk.in
+++ b/
subdirmk/regen.mk.in
@@
-1,10
+1,14
@@
+# subdirmk - rules for regenerating makefiles etc.
+# Copyright 2019 Mark Wooding
+# Copyright 2019 Ian Jackson
+# SPDX-License-Identifier: LGPL-2.0-or-later
CONFIGURE ?= configure
CONFIGURE ?= configure
-CONFIGURE_AC ?= $(CONFIGURE).ac
-CONFIG_STATUS ?= config.status
+CONFIGURE_AC ?= $(CONFIGURE).ac
+CONFIG_STATUS ?= config.status
-CONFIGURE_ACS += $(CONFIGURE_AC)
-CONFIGURE_ACS += subdirmk/subdirmk.ac
+CONFIGURE_ACS += $(CONFIGURE_AC)
+CONFIGURE_ACS += subdirmk/subdirmk.ac
$(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
cd $(top_srcdir) && autoconf
$(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
cd $(top_srcdir) && autoconf
@@
-12,13
+16,13
@@
$(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
$(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
./$(CONFIG_STATUS) --recheck
$(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
./$(CONFIG_STATUS) --recheck
-MAKEFILE_TEMPLATES += $(top_srcdir)/Perdir.sd.mk
+# Normally, generate will add all the inputs to MAKEFILE_TEMPLATES.
MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \
@_SUBDIRMK_MAKEFILES@ \
))
main.mk $(MAKEFILES): .makefiles.stamp ;
MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \
@_SUBDIRMK_MAKEFILES@ \
))
main.mk $(MAKEFILES): .makefiles.stamp ;
-.makefiles.stamp: \
+.makefiles.stamp: \
$(top_srcdir)/subdirmk/generate \
$(CONFIG_STATUS) \
$(MAKEFILE_TEMPLATES)
$(top_srcdir)/subdirmk/generate \
$(CONFIG_STATUS) \
$(MAKEFILE_TEMPLATES)
@@
-34,14
+38,14
@@
main.mk $(MAKEFILES): .makefiles.stamp ;
$(filter-out Subdir.sd.mk %/Subdir.sd.mk \
%.mk.in \
, $?),, \
$(filter-out Subdir.sd.mk %/Subdir.sd.mk \
%.mk.in \
, $?),, \
- $(
sort
\
+ $(
patsubst $(top_srcdir)/%,%, $(sort
\
$(patsubst %.sd.mk,%.mk,$(filter %.sd.mk,$?)) \
$(patsubst %.sd.mk,%.mk,$(filter %.sd.mk,$?)) \
- $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?))))
+ $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?))))
)
touch $@
realclean:: clean
$(RM) config.status config.log
touch $@
realclean:: clean
$(RM) config.status config.log
- $(RM) main.mk
subdirmk/regen.mk $(MAKEFILES)
+ $(RM) main.mk
$(MAKEFILES) @_SUBDIRMK_MAKEFILES@
$(RM) $(addsuffix Makefile,$(dir $(MAKEFILES)))
-include $(ALL_DEPFILES)
$(RM) $(addsuffix Makefile,$(dir $(MAKEFILES)))
-include $(ALL_DEPFILES)