chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
site: Support multiple addresses
[secnet.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index c0a6222b99b14a44a1b0eb1ad598bd1f1f5b029b..e2121d50c2eb8b38bce3c8ca92e1422efb50adf1 100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-18,7
+18,7
@@
.PHONY: all clean realclean distclean dist install
PACKAGE:=secnet
.PHONY: all clean realclean distclean dist install
PACKAGE:=secnet
-VERSION:=0.3.
3
+VERSION:=0.3.
4
@SET_MAKE@
@SET_MAKE@
@@
-68,6
+68,12
@@
OBJECTS:=version.o
TEST_OBJECTS:=
endif
TEST_OBJECTS:=
endif
+STALE_PYTHON_FILES= $(foreach e, py pyc, \
+ $(foreach p, /usr /usr/local, \
+ $(foreach l, ipaddr, \
+ $p/share/secnet/$l.$e \
+ )))
+
%.c: %.y
%.yy.c: %.fl
%.c: %.y
%.yy.c: %.fl
@@
-134,7
+140,7
@@
secnet: $(wildcard .git/packed-refs)
endif
check: eax-aes-test.confirm eax-serpent-test.confirm \
endif
check: eax-aes-test.confirm eax-serpent-test.confirm \
- eax-serpentbe-test.confirm
+ eax-serpentbe-test.confirm
check-ipaddrset
version.c: Makefile
echo "#include \"secnet.h\"" >$@.new
version.c: Makefile
echo "#include \"secnet.h\"" >$@.new
@@
-154,6
+160,10
@@
eax-%-test.confirm: eax-%-test eax-%-test.vectors
./$< <$(srcdir)/eax-$*-test.vectors >$@.new
mv -f $@.new $@
./$< <$(srcdir)/eax-$*-test.vectors >$@.new
mv -f $@.new $@
+check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
+ $(srcdir)/ipaddrset-test.py >ipaddrset-test.new
+ diff ipaddrset-test.expected ipaddrset-test.new
+
.PRECIOUS: eax-%-test
installdirs:
.PRECIOUS: eax-%-test
installdirs:
@@
-161,11
+171,23
@@
installdirs:
$(INSTALL) -d $(mandir)/man8
install: installdirs
$(INSTALL) -d $(mandir)/man8
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)'`
$(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) ${srcdir}/ipaddr
set.py $(prefix)/share/secnet/ipaddrset
.py
$(INSTALL) secnet.8 $(mandir)/man8/secnet.8
$(INSTALL) 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
clean:
$(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
$(RM) -f *.d *~ eax-*-test.confirm eax-*-test