.PHONY: all clean realclean distclean dist install
PACKAGE:=secnet
-VERSION=0.5.0
+VERSION=0.5.1
VPATH:=@srcdir@
srcdir:=@srcdir@
eax-test.o aes.o
ifeq (version.o,$(MAKECMDGOALS))
-OBJECTS:=version.o
+OBJECTS:=
TEST_OBJECTS:=
endif
+&OBJECTS += $(OBJECTS) $(TEST_OBJECTS)
+
STALE_PYTHON_FILES= $(foreach e, py pyc, \
$(foreach p, /usr /usr/local, \
$(foreach l, ipaddr, \
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
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
conffile.yy.o: ALL_CFLAGS += -Wno-sign-compare
secnet: $(OBJECTS)
- $(MAKE) version.o # *.o $(filter-out %.o, $^)
+ $(MAKE) -f main.mk version.o # *.o $(filter-out %.o, $^)
$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) version.o $(LDLIBS)
# We (always) regenerate the version, but only if we regenerate the
# binary. (This is necessary as the version string is can depend on
ifneq (,$(wildcard .git/HEAD))
# If we have (eg) committed, relink and thus regenerate the version
# with the new info from git describe.
-secnet: Makefile .git/HEAD $(shell sed -n 's#^ref: #.git/#p' .git/HEAD)
+secnet: Makefile .git/HEAD $(wildcard $(shell sed -n 's#^ref: #.git/#p' .git/HEAD))
secnet: $(wildcard .git/packed-refs)
endif
TESTDIRS=stest mtest
-FAST_CHECKS= eax-aes-test.confirm eax-serpent-test.confirm \
- eax-serpentbe-test.confirm check-ipaddrset \
- $(addprefix check-,$(TESTDIRS))
+&TARGETS_check = eax-aes-test.confirm eax-serpent-test.confirm \
+ eax-serpentbe-test.confirm ipaddrset.confirm
-CHECKS += $(FAST_CHECKS)
-CHECKS += msgcode-test.confirm
-
-check: $(CHECKS)
+&TARGETS_fullcheck += $(&TARGETS_check)
+&TARGETS_fullcheck += msgcode-test.confirm
recheck:
- rm -f $(FAST_CHECKS)
+ rm -f $(&TARGETS_check)
rm -rf $(addsuffix /d-*, $(TESTDIRS))
- $(MAKE) check
+ $(MAKE) -f main.mk check
-version.c: Makefile
+.PHONY: FORCE
+version.c: FORCE
echo "#include \"secnet.h\"" >$@.new
@set -ex; if test -e .git && type -p git >/dev/null; then \
v=$$(git describe --match 'v*'); v=$${v#v}; \
./$< <$(srcdir)/eax-$*-test.vectors >$@.new
mv -f $@.new $@
+&CDEPS_OBJECTS += msgcode-test.o
+
msgcode-test: msgcode-test.o
$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
./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
-
-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
install-force:
rm -f $(STALE_PYTHON_FILES)
- $(MAKE) install
+ $(MAKE) -f main.mk install
-clean:: $(addprefix clean-,$(TESTDIRS))
- $(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
- $(RM) -f *.d *.pyc *~ eax-*-test.confirm eax-*-test
+&CLEAN += .version.d
+&CLEAN += $(TARGETS) $(&TARGETS_check) $(&TARGETS_fullcheck)
+
+clean::
+ $(RM) -f *.o *.yy.[ch] *.tab.[ch] core version.c
+ $(RM) -f *.pyc *~ eax-*-test.confirm eax-*-test
$(RM) -rf __pycache__
$(RM) -f msgcode-test.confirm msgcode-test
-$(addprefix clean-,$(TESTDIRS)): clean-%:
- $(MAKE) -C $* clean
-
realclean:: clean
- $(RM) -f *~ Makefile config.h *.d \
+ $(RM) -f *~ Makefile config.h \
config.log config.status config.cache \
config.stamp Makefile.bak
# Release checklist:
#
-# 0. Use this checklist from Makefile.in
+# 0. Use this checklist from Subdir.sd.mk
#
# 1. Check that the tree has what you want
#