X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.in;h=9409b507d1685b47a8c6effe562d31bd1709c29b;hb=14f3ae0cbc3c4d1ca898a869cf2ed3d11693de13;hp=e59263fa54b1dab89249a7ada8e28e77682b1f45;hpb=a9ebbc41c1ceac1e1a8d6b73a87b600cdc2b30db;p=secnet.git

diff --git a/Makefile.in b/Makefile.in
index e59263f..9409b50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,16 +20,12 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION=0.4.5
+VERSION=0.5.0
 
-@SET_MAKE@
-
-srcdir:=@srcdir@
 VPATH:=@srcdir@
+srcdir:=@srcdir@
+include common.make
 
-SHELL:=/bin/sh
-RM:=@RM@
-CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 INSTALL_SCRIPT:=@INSTALL_SCRIPT@
@@ -43,14 +39,6 @@ datarootdir:=@datarootdir@
 transform:=@program_transform_name@
 mandir:=@mandir@
 
-CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
-	-W -Wno-unused -Wno-unused-parameter \
-	-Wno-pointer-sign -Wstrict-prototypes -Wmissing-prototypes \
-	-Wmissing-declarations -Wnested-externs -Wredundant-decls \
-	-Wpointer-arith -Wformat=2 -Winit-self \
-	-Wswitch-enum -Wunused-variable -Wunused-function -Wbad-function-cast \
-	-Wno-strict-aliasing -fno-strict-aliasing \
-	-MMD
 ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
 CPPFLAGS:=@CPPFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' $(EXTRA_CPPFLAGS)
 LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
@@ -99,13 +87,13 @@ ${srcdir}/configure: configure.in
 	cd ${srcdir} && autoconf
 
 # autoheader might not change config.h.in, so touch a stamp file.
-${srcdir}/config.h.in: stamp-h.in
-${srcdir}/stamp-h.in: configure.in
+${srcdir}/config.h.in: config.stamp.in
+${srcdir}/config.stamp.in: configure.in
 	cd ${srcdir} && autoheader
-	echo timestamp > ${srcdir}/stamp-h.in
+	echo timestamp > ${srcdir}/config.stamp.in
 
-config.h: stamp-h
-stamp-h: config.h.in config.status
+config.h: config.stamp
+config.stamp: config.h.in config.status
 	./config.status
 
 Makefile: Makefile.in config.status
@@ -143,8 +131,21 @@ secnet: Makefile .git/HEAD $(shell sed -n 's#^ref: #.git/#p' .git/HEAD)
 secnet: $(wildcard .git/packed-refs)
 endif
 
-check: eax-aes-test.confirm eax-serpent-test.confirm \
-	eax-serpentbe-test.confirm check-ipaddrset
+TESTDIRS=stest mtest
+
+FAST_CHECKS= eax-aes-test.confirm eax-serpent-test.confirm \
+	eax-serpentbe-test.confirm check-ipaddrset \
+	$(addprefix check-,$(TESTDIRS))
+
+CHECKS += $(FAST_CHECKS)
+CHECKS += msgcode-test.confirm
+
+check: $(CHECKS)
+
+recheck:
+	rm -f $(FAST_CHECKS)
+	rm -rf $(addsuffix /d-*, $(TESTDIRS))
+	$(MAKE) check
 
 version.c: Makefile
 	echo "#include \"secnet.h\"" >$@.new
@@ -164,10 +165,26 @@ eax-%-test.confirm: eax-%-test eax-%-test.vectors
 	./$< <$(srcdir)/eax-$*-test.vectors >$@.new
 	mv -f $@.new $@
 
+msgcode-test: msgcode-test.o
+	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+msgcode-test.confirm: msgcode-test
+	./msgcode-test
+	touch $@
+
 check-ipaddrset: 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 ipaddrset.py
+	$(MAKE) -C mtest check
+
+test-example/sites.conf:
+	$(MAKE) -C test-example
+
 .PRECIOUS: eax-%-test
 
 installdirs:
@@ -195,24 +212,22 @@ install-force:
 	rm -f $(STALE_PYTHON_FILES)
 	$(MAKE) install
 
-clean:
+clean: $(addprefix clean-,$(TESTDIRS))
 	$(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
 	$(RM) -f *.d *.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 \
 	config.log config.status config.cache \
-	stamp-h Makefile.bak
+	config.stamp Makefile.bak
 
 distclean:	realclean
 
-pfname:=$(PACKAGE)-$(VERSION)
-tarfname:=../$(pfname).tar
-dist:
-	$(RM) -rf $(tarfname) $(tarfname).gz
-	git archive --format=tar --prefix=$(pfname)/ HEAD -o $(tarfname)
-	gzip -9f $(tarfname)
-
 # Release checklist:
 #
 #  0. Use this checklist from Makefile.in