build system: Process test-example with autoconf

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 6bc02efe3f7eda8b6ddf87443f15512e79e1ee35..1c76f9a8f598de0196b3bc70e6d866ade6fc5480 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,14 +22,10 @@
 PACKAGE:=secnet
 VERSION=0.4.5
 
-@SET_MAKE@
-
-srcdir:=@srcdir@
 VPATH:=@srcdir@
 
-SHELL:=/bin/sh
-RM:=@RM@
-CC:=@CC@
+include common.make
+
 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
@@ -145,7 +133,7 @@ endif
 
 check: eax-aes-test.confirm eax-serpent-test.confirm \
        eax-serpentbe-test.confirm check-ipaddrset \
-       msgcode-test.confirm
+       msgcode-test.confirm check-stest
 
 version.c: Makefile
        echo "#include \"secnet.h\"" >$@.new
@@ -176,6 +164,12 @@ 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
+
+test-example/sites.conf:
+       $(MAKE) -C test-example
+
 .PRECIOUS: eax-%-test
 
 installdirs:
@@ -211,7 +205,7 @@ 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