X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile.in;h=6560746926d314eff26534fb6ff67d12724d54db;hb=a879e1b9baf4c21f91c16b7a522d732352c3c8d7;hp=1c76f9a8f598de0196b3bc70e6d866ade6fc5480;hpb=6e553442518e7cd93e779d2895cb4c26ba5ba793;p=secnet.git

diff --git a/Makefile.in b/Makefile.in
index 1c76f9a..6560746 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,7 +23,7 @@ PACKAGE:=secnet
 VERSION=0.4.5
 
 VPATH:=@srcdir@
-
+srcdir:=@srcdir@
 include common.make
 
 INSTALL:=@INSTALL@
@@ -131,9 +131,11 @@ secnet: Makefile .git/HEAD $(shell sed -n 's#^ref: #.git/#p' .git/HEAD)
 secnet: $(wildcard .git/packed-refs)
 endif
 
+TESTDIRS=stest mtest
+
 check: eax-aes-test.confirm eax-serpent-test.confirm \
 	eax-serpentbe-test.confirm check-ipaddrset \
-	msgcode-test.confirm check-stest
+	msgcode-test.confirm $(addprefix check-,$(TESTDIRS))
 
 version.c: Makefile
 	echo "#include \"secnet.h\"" >$@.new
@@ -167,6 +169,9 @@ check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
 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
 
@@ -197,11 +202,14 @@ 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) -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 \