X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=ecc6f27ed04a02649b310372a46a04fe24f4ebd2;hp=a7d9df8175c06a8bf9059ca314b3a8666730dba7;hb=37b5bdcf2560b655433355d61018d59f940bf295;hpb=5963521296680c2aeb40baeb72459dffc14cd996 diff --git a/Makefile.in b/Makefile.in index a7d9df8..ecc6f27 100644 --- 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 +.PHONY: all clean realclean distclean dist install PACKAGE:=secnet -VERSION:=0.07 +VERSION:=0.2.1 @SET_MAKE@ @@ -31,7 +31,15 @@ CC:=@CC@ INSTALL:=@INSTALL@ INSTALL_PROGRAM:=@INSTALL_PROGRAM@ -CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I. +CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \ + -W -Wno-unused \ + -Wno-pointer-sign -Wstrict-prototypes -Wmissing-prototypes \ + -Wmissing-declarations -Wnested-externs -Wredundant-decls \ + -Wpointer-arith -Wformat=2 -Winit-self \ + -Wswitch-enum -Wunused-variable -Wbad-function-cast \ + -Wno-strict-aliasing -fno-strict-aliasing +ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) +CPPFLAGS:=@CPPFLAGS@ LDFLAGS:=@LDFLAGS@ LDLIBS:=@LIBS@ @@ -40,75 +48,135 @@ exec_prefix:=@exec_prefix@ sbindir:=@sbindir@ sysconfdir:=@sysconfdir@ transform:=@program_transform_name@ +mandir:=@mandir@ 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 \ - secnet.c secnet.h serpent.c serpent.h serpentsboxes.h \ - site.c transform.c udp.c unaligned.h util.c util.h + serpent.o md5.o version.o tun.o slip.o sha1.o ipaddr.o log.o \ + process.o @LIBOBJS@ \ + hackypar.o %.c: %.y %.yy.c: %.fl - flex -o$@ $< + flex --header=$*.yy.h -o$@ $< -%.tab.c: %.y - bison -d $< +%.tab.c %.tab.h: %.y + bison -d -o $@ $< +%.o: %.c + $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -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 + 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 + +# C and header file dependency rules +SOURCES:=$(OBJECTS:.o=.c) +DEPENDS:=$(OBJECTS:.o=.d) + +$(DEPENDS): ${srcdir}/depend.sh + +%.d: %.c + ${srcdir}/depend.sh $(srcdir) $(CPPFLAGS) $(ALL_CFLAGS) $< > $@ -config.h: config.h.in config.status - $(SHELL) config.status +-include $(DEPENDS) -$(OBJECTS): config.h secnet.h util.h -conffile.o conffile.tab.o conffile.yy.o: conffile.h conffile_internal.h -secnet.c: conffile.h -md5.o: md5.h -serpent.o transform.o: serpent.h -serpent.o: serpentsboxes.h -conffile.o: modules.h -site.c util.c: unaligned.h +# Manual dependencies section +conffile.yy.c: conffile.fl conffile.tab.c +conffile.yy.h: conffile.yy.c +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 "#include \"secnet.h\"" >$@.new + echo "char version[]=\"secnet $(VERSION)\";" >>$@.new + mv -f $@.new $@ -install: all +installdirs: + $(INSTALL) -d $(prefix)/share/secnet $(sbindir) + $(INSTALL) -d $(mandir)/man8 + +install: installdirs $(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 + $(INSTALL) secnet.8 $(mandir)/man8/secnet.8 clean: - $(RM) -f $(srcdir)/*.o $(srcdir)/*~ $(srcdir)/*.yy.c \ - $(srcdir)/*.tab.[ch] + $(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c + $(RM) -f *.d *~ 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 *.d \ + config.log config.status config.cache \ + stamp-h Makefile.bak + +distclean: realclean pfname:=$(PACKAGE)-$(VERSION) +tarfname:=../$(pfname).tar dist: - $(RM) -rf $(pfname) - mkdir $(pfname) - for i in $(DISTFILES) ; do ln -s ../$$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 + $(RM) -rf $(tarfname) $(tarfname).gz + git archive --format=tar --prefix=$(pfname)/ HEAD -o $(tarfname) + gzip -9f $(tarfname) + +# Release checklist: +# 1. Check that the tree has what you want +# +# 2. Update VERSION (above) and debian/changelog +# but DO NOT COMMIT +# +# 3. Run +# ./configure +# make dist +# and check that the resulting tarball looks OK. +# Eg, untar it and build it, or have it reviewed. +# +# 3. Commit the updates to VERSION (above) and debian/changelog +# +# 4. git-tag -s v$(VERSION) +# +# 5. git-push origin +# +# 6. gpg --detach-sign ../secnet-$(VERSION).tar.gz +# +# 7. rsync -v ../secnet-$VERSION.tar.gz* \ +# chiark:/home/ianmdlvl/public-html/secnet/download/ +# +# 8. On chiark: +# tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$(VERSION).tar.gz +# cd secnet-$(VERSION) +# debian/rules build +# fakeroot debian/rules binary +# cp ../secnet_0.1.18.1-1_i386.deb ~/public-html/secnet/download/ +# +# 9. On chiark as user secnet: +# cd ~secnet/ +# rsync ~ianmdlvl/public-html/secnet/download/secnet* . +# +# 9. write and post a release announcement