-### -*-makefile-gmake-*-
-###
-### Top-level build script for toy project.
-###
-### (c) 2019 Mark Wooding
-###
-
-###----- Licensing notice ---------------------------------------------------
-###
-### This program is free software; you can redistribute it and/or modify
-### it under the terms of the GNU Library General Public License as
-### published by the Free Software Foundation; either version 2 of the
-### License, or (at your option) any later version.
-###
-### This program is distributed in the hope that it will be useful,
-### but WITHOUT ANY WARRANTY; without even the implied warranty of
-### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-### GNU Library General Public License for more details.
-###
-### You should have received a copy of the GNU Library General Public
-### License along with this program; if not, write to the Free
-### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-### MA 02111-1307, USA.
-
-## Default target.
-all::
-
-###--------------------------------------------------------------------------
-### Configuration things.
-
-## (This is a toy. More stuff is needed in a proper project.)
-
-## Source and build directories.
-srcdir = @srcdir@
-abs_srcdir = @abs_srcdir@
-abs_builddir = @abs_builddir@
-
-## Installation directories.
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-
-## Build options.
-CC = @CC@
-CFLAGS = @CFLAGS@
-DEFS = @DEFS@
-INCLUDES = @INCLUDES@
-LD = @CC@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-INCLUDES += -I$(srcdir)/lib/
-
-###--------------------------------------------------------------------------
-### Machinery.
-
-dirvars =
-dirtargets =
-ALL_SUBDIRS :=
-D :=
-%dirstack :=
-
-dirvars += TARGETS PROGRAMS LIBS CLEANFILES
-dirtargets += all clean check install
-
-define %descend-subdir
- %dirstack := $$D $$(%dirstack)
- D := $$(if $$D,$$D/)$1
- ALL_SUBDIRS += $$D
- include $$(srcdir)/$$D/Subdir.mk
- D := $$(firstword $$(dirstack))
- %dirstack := $$(wordlist 2,$$(words $$(%dirstack)),$$(%dirstack))
-endef
-descend-subdirs = $(foreach d,$1, \
- $(eval $(call %descend-subdir,$d)))
-
-V = 0
-v-tag = $(call %v-tag.$V,$1)
-%v-tag.0 = @printf " %-8s %s\n" "$1" "$@";
-%v-tag.1 =
-
-V_AT = $(%V_AT.$V)
-%V_AT.0 = @
-%V_AT.1 =
-
-VPATH = $(srcdir)
-
-COMPILE = $(call v-tag,CC)$(CC) -c -o$@ -MD \
- $(DEFS) $(INCLUDES) $(CFLAGS)
-%.o: %.c
- $(COMPILE) $<
-
-LINK = $(call v-tag,LD)$(LD) -o$@ \
- $(CFLAGS) $(LDFLAGS) $(LIBS)
-
-objects = $(addsuffix $(if $2,$2,.o), \
- $(basename $(filter %.c %.s %.S,$1)))
-
-ALL_DEPFILES :=
-notice-objects = $(eval ALL_DEPFILES += $$(patsubst %.o,%.d,$1))
-
-###--------------------------------------------------------------------------
-### Descend into subdirectories.
-
-SUBDIRS =
-
-SUBDIRS += lib
-SUBDIRS += src
-
-$(call descend-subdirs, $(SUBDIRS))
-
-###--------------------------------------------------------------------------
-### Maintaining the build system.
-
-$(srcdir)/configure: $(srcdir)/configure.ac
- $(call v-tag,AUTOCONF)cd $(srcdir) && autoconf
-
-config.status: $(srcdir)/configure
- $(call v-tag,CONFIG)./config.status --recheck
+# Makefile for secnet
+#
+# This file is part of secnet.
+# See README for full list of copyright holders.
+#
+# secnet is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# secnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# version 3 along with secnet; if not, see
+# https://www.gnu.org/licenses/gpl.html.
+
+.PHONY: all clean realclean distclean dist install
+
+PACKAGE:=secnet
+VERSION=0.5.0
+
+VPATH:=@srcdir@
+srcdir:=@srcdir@
+include common.make
+
+INSTALL:=@INSTALL@
+INSTALL_PROGRAM:=@INSTALL_PROGRAM@
+INSTALL_SCRIPT:=@INSTALL_SCRIPT@
+INSTALL_DATA:=@INSTALL_DATA@
+
+prefix:=$(DESTDIR)@prefix@
+exec_prefix:=@exec_prefix@
+sbindir:=@sbindir@
+sysconfdir:=$(DESTDIR)@sysconfdir@
+datarootdir:=@datarootdir@
+transform:=@program_transform_name@
+mandir:=@mandir@
+
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
+CPPFLAGS:=@CPPFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' $(EXTRA_CPPFLAGS)
+LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
+LDLIBS:=@LIBS@ $(EXTRA_LDLIBS)
+
+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-cbcmac.o transform-eax.o \
+ comm-common.o polypath.o \
+ netlink.o rsa.o dh.o serpent.o serpentbe.o \
+ md5.o sha512.o tun.o slip.o sha1.o ipaddr.o log.o \
+ process.o @LIBOBJS@ \
+ hackypar.o
+# version.o is handled specially below and in the link rule for secnet.
+
+PYMODULES := ipaddrset.py argparseactionnoyes.py
+
+TEST_OBJECTS:=eax-aes-test.o eax-serpent-test.o eax-serpentbe-test.o \
+ eax-test.o aes.o
+
+ifeq (version.o,$(MAKECMDGOALS))
+OBJECTS:=version.o
+TEST_OBJECTS:=
+endif
-Makefile: config.status $(srcdir)/Makefile.in \
- $(foreach d,$(ALL_SUBDIRS), $d/Makefile)
- $(call v-tag,SUBST)./config.status Makefile
-$(foreach d,$(ALL_SUBDIRS), \
- $(eval $d/Makefile: config.status $$(srcdir)/$d/Makefile.in; \
- $$(call v-tag,SUBST)./config.status $$@))
+STALE_PYTHON_FILES= $(foreach e, py pyc, \
+ $(foreach p, /usr /usr/local, \
+ $(foreach l, ipaddr, \
+ $(DESTDIR)$p/share/secnet/$l.$e \
+ )))
-###--------------------------------------------------------------------------
-### More machinery.
+%.c: %.y
-all_dirtargets = $(foreach d,$(ALL_SUBDIRS), \
- $(foreach t,$(dirtargets), $d/$t))
-
-$(all_dirtargets)::
+%.yy.c: %.fl
+ flex --header=$*.yy.h -o$@ $<
-ifeq ($(origin SUBDIR),undefined)
-$(foreach t,$(dirtargets), \
- $(eval $t:: $(foreach d,$(ALL_SUBDIRS),$d/$t)))
-else
-$(foreach t,$(dirtargets), \
- $(eval $t:: $(SUBDIR)/$t))
-endif
-$(foreach d,$(SUBDIRS), \
- $(foreach t,$(dirtargets), \
- $(eval $d/$t::)))
-.PHONY: $(foreach t,$(dirtargets),$t $(foreach d,$(ALL_SUBDIRS),$d/$t))
+%.tab.c %.tab.h: %.y
+ bison -d -o $@ $<
+
+%.o: %.c conffile.yy.h
+ $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
+
+all: $(TARGETS) check
+
+# 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: config.stamp.in
+${srcdir}/config.stamp.in: configure.in
+ cd ${srcdir} && autoheader
+ echo timestamp > ${srcdir}/config.stamp.in
+
+config.h: config.stamp
+config.stamp: config.h.in config.status
+ ./config.status
-$(foreach d,$(ALL_SUBDIRS), $d/clean):: %/clean:
- rm -f $*/*.o $*/*.d $($*_CLEANFILES)
+Makefile: Makefile.in config.status
+ ./config.status
-realclean:: clean
- rm -f config.status config.log
- rm -f Makefile $(foreach d,$(ALL_SUBDIRS), $d/Makefile)
+config.status: configure
+ ./config.status --recheck
+# End of config file remaking rules
--include $(ALL_DEPFILES)
+# C and header file dependency rules
+SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
+DEPENDS:=$(OBJECTS:.o=.d) $(TEST_OBJECTS:.o=.d)
+
+-include *.d
+
+# 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
+
+conffile.yy.o: ALL_CFLAGS += -Wno-sign-compare
+
+secnet: $(OBJECTS)
+ $(MAKE) version.o # *.o $(filter-out %.o, $^)
+ $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) version.o $(LDLIBS)
+# We (always) regenerate the version, but only if we regenerate the
+# binary. (This is necessary as the version string is can depend on
+# any of the source files, eg to see whether "+" is needed.)
+
+ifneq (,$(wildcard .git/HEAD))
+# If we have (eg) committed, relink and thus regenerate the version
+# with the new info from git describe.
+secnet: Makefile .git/HEAD $(shell sed -n 's#^ref: #.git/#p' .git/HEAD)
+secnet: $(wildcard .git/packed-refs)
+endif
-###----- That's all, folks --------------------------------------------------
+TESTDIRS=stest mtest
+
+FAST_CHECKS= eax-aes-test.confirm eax-serpent-test.confirm \
+ eax-serpentbe-test.confirm check-ipaddrset \
+ $(addprefix check-,$(TESTDIRS))
+
+CHECKS += $(FAST_CHECKS)
+CHECKS += msgcode-test.confirm
+
+check: $(CHECKS)
+
+recheck:
+ rm -f $(FAST_CHECKS)
+ rm -rf $(addsuffix /d-*, $(TESTDIRS))
+ $(MAKE) check
+
+version.c: Makefile
+ echo "#include \"secnet.h\"" >$@.new
+ @set -ex; if test -e .git && type -p git >/dev/null; then \
+ v=$$(git describe --match 'v*'); v=$${v#v}; \
+ if ! git diff --quiet HEAD; then v="$$v+"; fi; \
+ else \
+ v="$(VERSION)"; \
+ fi; \
+ echo "char version[]=\"secnet $$v\";" >>$@.new
+ mv -f $@.new $@
+
+eax-%-test: eax-%-test.o eax-test.o %.o
+ $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+eax-%-test.confirm: eax-%-test eax-%-test.vectors
+ ./$< <$(srcdir)/eax-$*-test.vectors >$@.new
+ mv -f $@.new $@
+
+msgcode-test: msgcode-test.o
+ $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+msgcode-test.confirm: msgcode-test
+ ./msgcode-test
+ touch $@
+
+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
+
+check-mtest: make-secnet-sites $(PYMODULES)
+ $(MAKE) -C mtest check
+
+test-example/sites.conf:
+ $(MAKE) -C test-example
+
+.PRECIOUS: eax-%-test
+
+installdirs:
+ $(INSTALL) -d $(prefix)/share/secnet $(sbindir)
+ $(INSTALL) -d $(mandir)/man8
+ $(INSTALL) -d $(datarootdir)/secnet
+
+install: installdirs
+ set -e; ok=true; for f in $(STALE_PYTHON_FILES); do \
+ if test -e $$f; then \
+ echo >&2 "ERROR: $$f still exists "\
+ "- try \`make install-force'"; \
+ ok=false; \
+ fi; \
+ done; \
+ $$ok
+ $(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'`
+ $(INSTALL_PROGRAM) ${srcdir}/make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'`
+ set -e; for m in $(PYMODULES); do \
+ $(INSTALL_DATA) ${srcdir}/$$m $(prefix)/share/secnet/$$m; \
+ done
+ $(INSTALL_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \
+ $(datarootdir)/secnet/.
+ $(INSTALL_DATA) ${srcdir}/secnet.8 $(mandir)/man8/secnet.8
+
+install-force:
+ rm -f $(STALE_PYTHON_FILES)
+ $(MAKE) install
+
+clean: $(addprefix clean-,$(TESTDIRS))
+ $(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
+ $(RM) -f *.d *.pyc *~ eax-*-test.confirm eax-*-test
+ $(RM) -rf __pycache__
+ $(RM) -f msgcode-test.confirm msgcode-test
+
+$(addprefix clean-,$(TESTDIRS)): clean-%:
+ $(MAKE) -C $* clean
+
+realclean: clean
+ $(RM) -f *~ Makefile config.h *.d \
+ config.log config.status config.cache \
+ config.stamp Makefile.bak
+
+distclean: realclean
+
+# Release checklist:
+#
+# 0. Use this checklist from Makefile.in
+#
+# 1. Check that the tree has what you want
+#
+# 2. Update changelog:
+# gbp dch --since=<PREVIOUS VERSION>
+# and then edit debian/changelog.
+#
+# 3. Update VERSION (in this file, above) and
+# finalise debian/changelog (removing ~ from version) and commit.
+#
+# 4. Build source and binaries:
+# dgit -wgf sbuild -A -c stretch -j8
+#
+# 5. dpkg -i on zealot just to check
+# dpkg -i ~ian/things/Fvpn/bpd/secnet_${VERSION}_amd64.deb
+#
+# 6. run it on chiark
+# check we can still ping davenant and chiark
+#
+# 7. Make git tag and source tarball signature:
+# git-tag -u general -m "secnet $VERSION" -s v${VERSION//\~/_}
+# gpg -u general --detach-sign ../bpd/secnet_$VERSION.tar.gz
+#
+# 8. Publish the branch and distriubtion files:
+# git-push origin v${VERSION//\~/_} v${VERSION//\~/_}~0:master
+# dcmd rsync -v ../bpd/secnet_${VERSION}_multi.changes chiark:/home/ianmdlvl/public-html/secnet/download/
+#
+# 9. Sort out html. On chiark as user secnet:
+# cd ~secnet/public-html/release/
+# mkdir $VERSION
+# cd $VERSION
+# ln -s /home/ianmdlvl/public-html/secnet/download/secnet?$VERSION* .
+# ln -sfn $VERSION ../current
+#
+# 10. write and post a release announcement
+# cd ../bpd
+# dcmd sha256sum secnet_${VERSION}_multi.changes
+# ...
+# gpg --clearsign ../release-announcement
+# rsync -vP ../release-announcement.asc c:mail/d/
+#
+# 11. bump changelog version in master, to new version with ~
~ian / secnet.git / blobdiff