X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=ba5c0da7db72e56d067697cc9627457d748c3b32;hp=841a49ba5b248a760f91be68a22679012ae9a8d4;hb=11653375c39594d5d4822498941bc6288d0136ed;hpb=ce5c098f8a19a42ddaeb488ed643ae3b5e697c7b diff --git a/Makefile.in b/Makefile.in index 841a49b..ba5c0da 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,24 +1,26 @@ # Makefile for secnet -# Copyright (C) 1995-2001 Stephen Early - -# This program 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 2, 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 General Public License for more details. - +# +# 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 d 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 -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# 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.3.4 +VERSION:=0.4.0 @SET_MAKE@ @@ -30,11 +32,14 @@ RM:=@RM@ CC:=@CC@ INSTALL:=@INSTALL@ INSTALL_PROGRAM:=@INSTALL_PROGRAM@ +INSTALL_SCRIPT:=@INSTALL_SCRIPT@ +INSTALL_DATA:=@INSTALL_DATA@ -prefix:=@prefix@ +prefix:=$(DESTDIR)@prefix@ exec_prefix:=@exec_prefix@ sbindir:=@sbindir@ -sysconfdir:=@sysconfdir@ +sysconfdir:=$(DESTDIR)@sysconfdir@ +datarootdir:=@datarootdir@ transform:=@program_transform_name@ mandir:=@mandir@ @@ -47,7 +52,7 @@ CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \ -Wno-strict-aliasing -fno-strict-aliasing \ -MMD ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS) -CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS) +CPPFLAGS:=@CPPFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' $(EXTRA_CPPFLAGS) LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS) LDLIBS:=@LIBS@ $(EXTRA_LDLIBS) @@ -73,7 +78,7 @@ endif STALE_PYTHON_FILES= $(foreach e, py pyc, \ $(foreach p, /usr /usr/local, \ $(foreach l, ipaddr, \ - $p/share/secnet/$l.$e \ + $(DESTDIR)$p/share/secnet/$l.$e \ ))) %.c: %.y @@ -84,7 +89,7 @@ STALE_PYTHON_FILES= $(foreach e, py pyc, \ %.tab.c %.tab.h: %.y bison -d -o $@ $< -%.o: %.c +%.o: %.c conffile.yy.h $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@ all: $(TARGETS) check @@ -166,6 +171,7 @@ check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected 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 \ @@ -178,16 +184,18 @@ install: installdirs $$ok $(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'` $(INSTALL_PROGRAM) ${srcdir}/make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'` - $(INSTALL) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py - $(INSTALL) secnet.8 $(mandir)/man8/secnet.8 + $(INSTALL_DATA) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py + $(INSTALL_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \ + $(datarootdir)/secnet/. + $(INSTALL_DATA) secnet.8 $(mandir)/man8/secnet.8 install-force: rm -f $(STALE_PYTHON_FILES) $(MAKE) install clean: - $(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c - $(RM) -f *.d *~ eax-*-test.confirm eax-*-test + $(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c + $(RM) -f *.d *.pyc *~ eax-*-test.confirm eax-*-test realclean: clean $(RM) -f *~ Makefile config.h *.d \ @@ -217,9 +225,9 @@ dist: # # 3. Commit the updates to VERSION (above) and debian/changelog # -# 4. git-tag -m "secnet $VERSION" -s v$VERSION +# 4. git-tag -m "secnet $VERSION" -s v${VERSION//\~/_} # -# 5. git-push origin v$VERSION v${VERSION}~0:master +# 5. git-push origin v${VERSION//\~/_} v${VERSION//\~/_}~0:master # # 6. Run, again, # make dist @@ -229,17 +237,28 @@ dist: # 8. rsync -v ../secnet-$VERSION.tar.gz* \ # chiark:/home/ianmdlvl/public-html/secnet/download/ # -# 9. On chiark: +# 9. In zealot's squeeze chroot: +# rm -rf ../d; mkdir ../d; cd ../d +# tar zxf ../secnet-$VERSION.tar.gz +# cd secnet-$VERSION +# dpkg-buildpackage -a -uc -us -rfakeroot +# rsync -vP ../secnet_${VERSION}_i386.deb ianmdlvl@chiark:public-html/secnet/download/ +# +# 9a. On chiark as ianmdlvl: +# cd ~ianmdlvl/secnet-build/ # tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$VERSION.tar.gz # cd secnet-$VERSION -# debian/rules build -# fakeroot debian/rules binary -# mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/ +# dpkg-buildpackage -a -uc -us -rfakeroot +# mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/backport/ # # 10. On chiark as user secnet: # cd ~secnet/public-html/release/ # mkdir $VERSION # cd $VERSION # ln -s /home/ianmdlvl/public-html/secnet/download/secnet?$VERSION* . +# mkdir polypath-backport +# ln -s /home/ianmdlvl/public-html/secnet/download/backport/secnet?$VERSION* polypath-backport/. +# ln -s /home/ianmdlvl/public-html/secnet/download/backport/*adns* polypath-backport/. # # 11. write and post a release announcement +# find -type l | sort | xargs sha256sum