~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
site: When reporting resolution complete, print only iaddr
[secnet]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
5ebc28d
..
5970b87
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.4
+VERSION:=0.
4.0~~iwj~
@SET_MAKE@
@SET_MAKE@
@@
-30,6
+30,15
@@
RM:=@RM@
CC:=@CC@
INSTALL:=@INSTALL@
INSTALL_PROGRAM:=@INSTALL_PROGRAM@
CC:=@CC@
INSTALL:=@INSTALL@
INSTALL_PROGRAM:=@INSTALL_PROGRAM@
+INSTALL_SCRIPT:=@INSTALL_SCRIPT@
+
+prefix:=@prefix@
+exec_prefix:=@exec_prefix@
+sbindir:=@sbindir@
+sysconfdir:=@sysconfdir@
+datarootdir:=@datarootdir@
+transform:=@program_transform_name@
+mandir:=@mandir@
CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
-W -Wno-unused -Wno-unused-parameter \
CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
-W -Wno-unused -Wno-unused-parameter \
@@
-40,21
+49,15
@@
CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
-Wno-strict-aliasing -fno-strict-aliasing \
-MMD
ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
-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)
LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
LDLIBS:=@LIBS@ $(EXTRA_LDLIBS)
-prefix:=@prefix@
-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-cbcmac.o transform-eax.o \
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@ \
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@ \
@@
-69,6
+72,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
@@
-77,7
+86,7
@@
endif
%.tab.c %.tab.h: %.y
bison -d -o $@ $<
%.tab.c %.tab.h: %.y
bison -d -o $@ $<
-%.o: %.c
+%.o: %.c
conffile.yy.h
$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
all: $(TARGETS) check
$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
all: $(TARGETS) check
@@
-159,16
+168,31
@@
check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
installdirs:
$(INSTALL) -d $(prefix)/share/secnet $(sbindir)
$(INSTALL) -d $(mandir)/man8
installdirs:
$(INSTALL) -d $(prefix)/share/secnet $(sbindir)
$(INSTALL) -d $(mandir)/man8
+ $(INSTALL) -d $(datarootdir)/secnet
install: installdirs
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) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py
$(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_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \
+ $(datarootdir)/secnet/.
$(INSTALL) secnet.8 $(mandir)/man8/secnet.8
$(INSTALL) secnet.8 $(mandir)/man8/secnet.8
+install-force:
+ rm -f $(STALE_PYTHON_FILES)
+ $(MAKE) install
+
clean:
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 \
realclean: clean
$(RM) -f *~ Makefile config.h *.d \