Import release 0.1.15

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9a912b5d455b25d3370451b6580aef396a9b4be2..af33bf56d8f5e8c26d487306877aa814a229bd3e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-.PHONY:        all clean realclean dist install distclean
+.PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.11
+VERSION:=0.1.15
 
 @SET_MAKE@
 
@@ -31,7 +31,8 @@ CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 
-CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I$(srcdir) -I.
+CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
 LDFLAGS:=@LDFLAGS@
 LDLIBS:=@LIBS@
 
@@ -54,10 +55,11 @@ DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
        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 \
+       configure.in debian depend.sh dh.c \
        example.conf \
        getopt.c getopt1.c getopt.h \
-       install.sh ipaddr.c ipaddr.h ipaddr.py linux log.c md5.c md5.h \
+       install-sh ipaddr.c ipaddr.h ipaddr.py linux log.c \
+       magic.h md5.c md5.h \
        make-secnet-sites \
        modules.c netlink.c netlink.h process.c process.h \
        random.c resolver.c rsa.c \
@@ -74,6 +76,8 @@ DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
 %.tab.c:       %.y
        bison -d -o $@ $<
 
+%.o: %.c
+       $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
 
 all:   $(TARGETS)
 
@@ -98,37 +102,39 @@ config.status: configure
        ./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.o: conffile.h process.h
-process.o: process.h
-log.o: process.h
-md5.o: md5.h
-serpent.o transform.o: serpent.h
-serpent.o: serpentsboxes.h
-conffile.o: ipaddr.h
-site.c util.c: unaligned.h
+# C and header file dependency rules
+SOURCES:=$(OBJECTS:.o=.c)
+DEPENDS:=$(OBJECTS:.o=.d)
+
+$(DEPENDS): ${srcdir}/depend.sh
+
+%.d: %.c
+       ${srcdir}/depend.sh $(srcdir) $(ALL_CFLAGS) $< > $@
+
+-include $(DEPENDS)
+
+# Manual dependencies section
 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)
+       $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
 
 version.c: Makefile
-       echo "char version[]=\"secnet-$(VERSION)\";" >version.c
+       echo "char version[]=\"secnet $(VERSION)\";" >version.c
 
 install: all
-       $(INSTALL_PROGRAM) -D secnet $(sbindir)/`echo secnet|sed '$(transform)'`
-       $(INSTALL_PROGRAM) -D make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'`
-       $(INSTALL) -D ipaddr.py $(prefix)/share/secnet/ipaddr.py
+       $(INSTALL) -d $(prefix)/share/secnet $(sbindir)
+       $(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'`
+       $(INSTALL_PROGRAM) ${srcdir}/make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'`
+       $(INSTALL) ${srcdir}/ipaddr.py $(prefix)/share/secnet/ipaddr.py
 
 clean:
        $(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
 
 realclean:     clean
-       $(RM) -f *~ Makefile config.h \
+       $(RM) -f *~ Makefile config.h  *.d \
        config.log config.status config.cache \
        stamp-h Makefile.bak
 
@@ -139,6 +145,6 @@ dist:
        $(RM) -rf $(pfname)
        mkdir $(pfname)
        for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
-       tar hcf ../$(pfname).tar $(pfname)
+       tar hcf ../$(pfname).tar --exclude=CVS --exclude=.cvsignore $(pfname)
        gzip -9f ../$(pfname).tar
        $(RM) -rf $(pfname)