chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CREDITS: Credit Mark properly (!)
[secnet.git]
/
Subdir.sd.mk
diff --git
a/Subdir.sd.mk
b/Subdir.sd.mk
index 2841cb1ba3eb267abd64eb33359d6e2f5b7796e0..bb2476fbc4413aa90dbe2573c4bc4edd1a74757f 100644
(file)
--- a/
Subdir.sd.mk
+++ b/
Subdir.sd.mk
@@
-65,6
+65,9
@@
OBJECTS:=version.o
TEST_OBJECTS:=
endif
TEST_OBJECTS:=
endif
+&OBJECTS += $(OBJECTS) $(TEST_OBJECTS)
+&:include subdirmk/cdeps.sd.mk
+
STALE_PYTHON_FILES= $(foreach e, py pyc, \
$(foreach p, /usr /usr/local, \
$(foreach l, ipaddr, \
STALE_PYTHON_FILES= $(foreach e, py pyc, \
$(foreach p, /usr /usr/local, \
$(foreach l, ipaddr, \
@@
-80,9
+83,9
@@
STALE_PYTHON_FILES= $(foreach e, py pyc, \
bison -d -o $@ $<
%.o: %.c conffile.yy.h
bison -d -o $@ $<
%.o: %.c conffile.yy.h
- $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(CPPFLAGS) $(ALL_CFLAGS)
$(CDEPS_CFLAGS)
-c $< -o $@
-all:: $(TARGETS)
check
+all:: $(TARGETS)
${srcdir}/config.h.in: configure.ac
cd ${srcdir} && autoheader
${srcdir}/config.h.in: configure.ac
cd ${srcdir} && autoheader
@@
-91,12
+94,6
@@
${srcdir}/config.h.in: configure.ac
MAKEFILE_TEMPLATES += config.h.in
CONFIG_STATUS_OUTPUTS += config.h
MAKEFILE_TEMPLATES += config.h.in
CONFIG_STATUS_OUTPUTS += config.h
-# C and header file dependency rules
-SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
-DEPENDS:=$(OBJECTS:.o=.d) $(TEST_OBJECTS:.o=.d)
-
--include *.d
-
# Manual dependencies section
conffile.yy.c: conffile.fl conffile.tab.c
conffile.yy.h: conffile.yy.c
# Manual dependencies section
conffile.yy.c: conffile.fl conffile.tab.c
conffile.yy.h: conffile.yy.c
@@
-121,17
+118,15
@@
endif
TESTDIRS=stest mtest
TESTDIRS=stest mtest
-
FAST_CHECKS
= eax-aes-test.confirm eax-serpent-test.confirm \
- eax-serpentbe-test.confirm
check-ipaddrset
\
- $(add
prefix check-
,$(TESTDIRS))
+
&TARGETS_check
= eax-aes-test.confirm eax-serpent-test.confirm \
+ eax-serpentbe-test.confirm
ipaddrset.confirm
\
+ $(add
suffix /check
,$(TESTDIRS))
-CHECKS += $(FAST_CHECKS)
-CHECKS += msgcode-test.confirm
-
-check: $(CHECKS)
+&TARGETS_fullcheck += $(&TARGETS_check)
+&TARGETS_fullcheck += msgcode-test.confirm
recheck:
recheck:
- rm -f $(
FAST_CHECKS
)
+ rm -f $(
&TARGETS_CHECK
)
rm -rf $(addsuffix /d-*, $(TESTDIRS))
$(MAKE) check
rm -rf $(addsuffix /d-*, $(TESTDIRS))
$(MAKE) check
@@
-160,18
+155,10
@@
msgcode-test.confirm: msgcode-test
./msgcode-test
touch $@
./msgcode-test
touch $@
-
check-ipaddrset
: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
+
ipaddrset.confirm
: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
$(srcdir)/ipaddrset-test.py >ipaddrset-test.new
diff -u $(srcdir)/ipaddrset-test.expected ipaddrset-test.new
$(srcdir)/ipaddrset-test.py >ipaddrset-test.new
diff -u $(srcdir)/ipaddrset-test.expected ipaddrset-test.new
-
-check-stest: secnet test-example/sites.conf
- $(MAKE) -C stest check
-
-check-mtest: make-secnet-sites $(PYMODULES)
- $(MAKE) -C mtest check
-
-test-example/sites.conf:
- $(MAKE) -C test-example
+ touch $@
.PRECIOUS: eax-%-test
.PRECIOUS: eax-%-test
@@
-202,17
+189,15
@@
install-force:
rm -f $(STALE_PYTHON_FILES)
$(MAKE) install
rm -f $(STALE_PYTHON_FILES)
$(MAKE) install
-clean::
$(addprefix clean-,$(TESTDIRS))
+clean::
$(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
$(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
- $(RM) -f *.d *.pyc *~ eax-*-test.confirm eax-*-test
+ $(RM) -f *.pyc *~ eax-*-test.confirm eax-*-test
+ $(RM) $(&CLEAN)
$(RM) -rf __pycache__
$(RM) -f msgcode-test.confirm msgcode-test
$(RM) -rf __pycache__
$(RM) -f msgcode-test.confirm msgcode-test
-$(addprefix clean-,$(TESTDIRS)): clean-%:
- $(MAKE) -C $* clean
-
realclean:: clean
realclean:: clean
- $(RM) -f *~ Makefile config.h
*.d
\
+ $(RM) -f *~ Makefile config.h \
config.log config.status config.cache \
config.stamp Makefile.bak
config.log config.status config.cache \
config.stamp Makefile.bak