X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.in;h=60e63cd936458c3c6328c171a1a704fb80b22f60;hb=3b83c93292fbf6c4e859ce513bdf54ad90733f96;hp=80db7d9ff740aaeb2a2d6824a3ec34ec79c55d19;hpb=d3fe100dfc120244d316e083ce87b1eb130fe4fd;p=secnet.git

diff --git a/Makefile.in b/Makefile.in
index 80db7d9..60e63cd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.12
+VERSION:=0.1.16
 
 @SET_MAKE@
 
@@ -31,7 +31,11 @@ CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 
-CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I$(srcdir) -I.
+# Use -DHACKY_PARALLEL if you are compiling secnet for an extremely
+# slow machine
+#CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -DHACKY_PARALLEL
+CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
 LDFLAGS:=@LDFLAGS@
 LDLIBS:=@LIBS@
 
@@ -46,25 +50,31 @@ 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 tun.o slip.o sha1.o ipaddr.o log.o \
-	process.o @LIBOBJS@
+	process.o @LIBOBJS@ \
+	hackypar.o
 
+DISTDIRS:=debian
 DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
 	NEWS NOTES README TODO \
-	alloca.c \
+	ac_prog_cc_no_writeable_strings.m4 \
 	conffile.c conffile.fl conffile.h conffile.y \
 	conffile_internal.h config.h.bot \
 	config.h.in config.h.top configure \
-	configure.in debian depend.sh dh.c \
+	configure.in 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 \
 	secnet.c secnet.h serpent.c serpent.h serpentsboxes.h \
 	snprintf.c snprintf.h \
 	sha1.c site.c slip.c stamp-h.in transform.c tun.c udp.c \
-	unaligned.h util.c util.h
+	unaligned.h util.c util.h \
+	hackypar.c hackypar.h
+DISTSUBDIRS:=debian/conffiles debian/copyright debian/changelog \
+	debian/control debian/init debian/rules
 
 %.c:	%.y
 
@@ -74,6 +84,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)
 
@@ -105,7 +117,7 @@ DEPENDS:=$(OBJECTS:.o=.d)
 $(DEPENDS): ${srcdir}/depend.sh
 
 %.d: %.c
-	${srcdir}/depend.sh $(srcdir) $(CFLAGS) $< > $@
+	${srcdir}/depend.sh $(srcdir) $(ALL_CFLAGS) $< > $@
 
 -include $(DEPENDS)
 
@@ -115,9 +127,10 @@ conffile.tab.c:	conffile.y
 # 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) -d $(prefix)/share/secnet $(sbindir)
@@ -139,7 +152,9 @@ pfname:=$(PACKAGE)-$(VERSION)
 dist:
 	$(RM) -rf $(pfname)
 	mkdir $(pfname)
+	for i in $(DISTDIRS) ; do mkdir $(pfname)/$$i ; done
 	for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
-	tar hcf ../$(pfname).tar $(pfname)
+	for i in $(DISTSUBDIRS) ; do ln -s ../../$(srcdir)/$$i $(pfname)/$$i ; done
+	tar hcf ../$(pfname).tar --exclude=CVS --exclude=.cvsignore $(pfname)
 	gzip -9f ../$(pfname).tar
 	$(RM) -rf $(pfname)