Import release 0.1.4

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2dea73838574a95fea287ba2c9a44a8fb2e26ddc..f53957e0cc98f9c3d55c8a874d109f2e7203d77e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:        all clean realclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.06
+VERSION:=0.1.4
 
 @SET_MAKE@
 
@@ -31,7 +31,7 @@ CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 
-CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I.
+CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I$(srcdir) -I.
 LDFLAGS:=@LDFLAGS@
 LDLIBS:=@LIBS@
 
@@ -45,15 +45,20 @@ TARGETS:=secnet
 
 OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
        resolver.o random.o udp.o site.o transform.o netlink.o rsa.o dh.o \
-       serpent.o md5.o version.o
-
-DISTFILES:=COPYING INSTALL Makefile.in NOTES README TODO conffile.c \
-       conffile.fl conffile.h conffile.y conffile_internal.h config.h.bot \
-       config.h.in config.h.top configure configure.in dh.c \
-       example-sites-file example.conf install.sh linux md5.c md5.h \
-       modules.c modules.h netlink.c random.c resolver.c rsa.c \
+       serpent.o md5.o version.o tun.o slip.o sha1.o
+
+DISTFILES:=COPYING CREDITS INSTALL Makefile.in NOTES README TODO \
+       conffile.c conffile.fl conffile.h conffile.y \
+       conffile_internal.h config.h.bot \
+       config.h.in config.h.top configure \
+       configure.in debian dh.c \
+       example-sites-file example.conf make-secnet-sites.py \
+       install.sh ipaddr.py linux md5.c md5.h \
+       modules.c modules.h netlink.c netlink.h \
+       random.c resolver.c rsa.c \
        secnet.c secnet.h serpent.c serpent.h serpentsboxes.h \
-       site.c transform.c udp.c util.c util.h
+       sha1.c site.c slip.c stamp-h.in transform.c tun.c udp.c \
+       unaligned.h util.c util.h
 
 %.c:   %.y
 
@@ -61,17 +66,33 @@ DISTFILES:=COPYING INSTALL Makefile.in NOTES README TODO conffile.c \
        flex -o$@ $<
 
 %.tab.c:       %.y
-       bison -d $<
+       bison -d -o $@ $<
 
 
 all:   $(TARGETS)
 
+# Automatic remaking of configuration files, from autoconf documentation
+${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 config.h.top config.h.bot
+       cd ${srcdir} && autoheader
+       echo timestamp > ${srcdir}/stamp-h.in
+
+config.h: stamp-h
+stamp-h: config.h.in config.status
+       ./config.status
+
 Makefile: Makefile.in config.status
-       $(SHELL) config.status
+       ./config.status
 
 config.status: configure
-       $(srcdir)/configure --no-create
+       ./config.status --recheck
+# End of config file remaking rules
 
+# Manual dependencies section - XXX use autodep eventually
 $(OBJECTS): config.h secnet.h util.h
 conffile.o conffile.tab.o conffile.yy.o: conffile.h conffile_internal.h
 secnet.c: conffile.h
@@ -79,6 +100,11 @@ md5.o: md5.h
 serpent.o transform.o: serpent.h
 serpent.o: serpentsboxes.h
 conffile.o: modules.h
+site.c util.c: unaligned.h
+conffile.yy.c: conffile.fl conffile.tab.c
+conffile.tab.c:        conffile.y
+netlink.o tun.o slip.o: netlink.h
+# End of manual dependencies section
 
 secnet:        $(OBJECTS)
 
@@ -86,25 +112,21 @@ version.c: Makefile
        echo "char version[]=\"secnet-$(VERSION)\";" >version.c
 
 install: all
-       $(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'`
+       $(INSTALL_PROGRAM) -D secnet $(sbindir)/`echo secnet|sed '$(transform)'`
 
 clean:
-       $(RM) -f $(srcdir)/*.o $(srcdir)/*~ $(srcdir)/*.yy.c \
-               $(srcdir)/*.tab.[ch]
+       $(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
 
 realclean:     clean
-       $(RM) -f $(TARGETS) $(srcdir)/Makefile $(srcdir)/config.h \
-       $(srcdir)/config.log $(srcdir)/config.status $(srcdir)/config.cache \
-       $(srcdir)/Makefile.bak core
+       $(RM) -f *~ Makefile config.h \
+       config.log config.status config.cache \
+       stamp-h Makefile.bak
 
 pfname:=$(PACKAGE)-$(VERSION)
 dist:
        $(RM) -rf $(pfname)
        mkdir $(pfname)
-       for i in $(DISTFILES) ; do ln -s ../$$i $(pfname)/ ; done
+       for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
        tar hcf ../$(pfname).tar $(pfname)
        gzip -9f ../$(pfname).tar
        $(RM) -rf $(pfname)
-
-conffile.yy.c: conffile.fl conffile.tab.c
-conffile.tab.c:        conffile.y