chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolver: Provide input name as argument to callback
[secnet.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index 9884dcd1f0d7d22633b8bd1ece2807597ef1615e..a6ac640cc14c43cea08962a8ad9435f4f291306c 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.
2~beta1
+VERSION:=0.3.
4
@SET_MAKE@
@SET_MAKE@
@@
-37,7
+37,8
@@
CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
-Wmissing-declarations -Wnested-externs -Wredundant-decls \
-Wpointer-arith -Wformat=2 -Winit-self \
-Wswitch-enum -Wunused-variable -Wunused-function -Wbad-function-cast \
-Wmissing-declarations -Wnested-externs -Wredundant-decls \
-Wpointer-arith -Wformat=2 -Winit-self \
-Wswitch-enum -Wunused-variable -Wunused-function -Wbad-function-cast \
- -Wno-strict-aliasing -fno-strict-aliasing
+ -Wno-strict-aliasing -fno-strict-aliasing \
+ -MMD
ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
@@
-68,6
+69,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
@@
-106,12
+113,7
@@
config.status: configure
SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
DEPENDS:=$(OBJECTS:.o=.d) $(TEST_OBJECTS:.o=.d)
SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
DEPENDS:=$(OBJECTS:.o=.d) $(TEST_OBJECTS:.o=.d)
-$(DEPENDS): ${srcdir}/depend.sh
-
-%.d: %.c
- ${srcdir}/depend.sh $(srcdir) $(CPPFLAGS) $(ALL_CFLAGS) $< > $@
-
--include $(DEPENDS)
+-include *.d
# Manual dependencies section
conffile.yy.c: conffile.fl conffile.tab.c
# Manual dependencies section
conffile.yy.c: conffile.fl conffile.tab.c
@@
-134,7
+136,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
+156,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 -u ipaddrset-test.expected ipaddrset-test.new
+
.PRECIOUS: eax-%-test
installdirs:
.PRECIOUS: eax-%-test
installdirs:
@@
-161,11
+167,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