chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Python encoding declaration
[secnet.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index 02103131ee7e1911724c2454f4755e63aa9dfd40..43df9ebe433c2fdfc07fde0ef7cfaf474bbca697 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.1.1
4
+VERSION:=0.1.1
7
@SET_MAKE@
@SET_MAKE@
@@
-31,7
+31,12
@@
CC:=@CC@
INSTALL:=@INSTALL@
INSTALL_PROGRAM:=@INSTALL_PROGRAM@
INSTALL:=@INSTALL@
INSTALL_PROGRAM:=@INSTALL_PROGRAM@
-CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I$(srcdir) -I.
+# Use -DHACKY_PARALLEL if you are compiling secnet for an extremely
+# slow machine
+#CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -DHACKY_PARALLEL
+CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
+CPPFLAGS:=@CPPFLAGS@
LDFLAGS:=@LDFLAGS@
LDLIBS:=@LIBS@
LDFLAGS:=@LDFLAGS@
LDLIBS:=@LIBS@
@@
-46,15
+51,17
@@
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.o netlink.o rsa.o dh.o \
serpent.o md5.o version.o tun.o slip.o sha1.o ipaddr.o log.o \
OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
resolver.o random.o udp.o site.o transform.o netlink.o rsa.o dh.o \
serpent.o md5.o version.o tun.o slip.o sha1.o ipaddr.o log.o \
- process.o @LIBOBJS@
+ process.o @LIBOBJS@ \
+ hackypar.o
+DISTDIRS:=debian
DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
NEWS NOTES README TODO \
DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
NEWS NOTES README TODO \
- a
lloca.c
\
+ a
c_prog_cc_no_writeable_strings.m4
\
conffile.c conffile.fl conffile.h conffile.y \
conffile.c conffile.fl conffile.h conffile.y \
- conffile_internal.h
config.h.bot
\
- config.h.in config
.h.top config
ure \
- configure.in de
bian de
pend.sh dh.c \
+ conffile_internal.h \
+ config.h.in configure \
+ configure.in depend.sh dh.c \
example.conf \
getopt.c getopt1.c getopt.h \
install-sh ipaddr.c ipaddr.h ipaddr.py linux log.c \
example.conf \
getopt.c getopt1.c getopt.h \
install-sh ipaddr.c ipaddr.h ipaddr.py linux log.c \
@@
-65,16
+72,21
@@
DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
secnet.c secnet.h serpent.c serpent.h serpentsboxes.h \
snprintf.c snprintf.h \
sha1.c site.c slip.c stamp-h.in transform.c tun.c udp.c \
secnet.c secnet.h serpent.c serpent.h serpentsboxes.h \
snprintf.c snprintf.h \
sha1.c site.c slip.c stamp-h.in transform.c tun.c udp.c \
- unaligned.h util.c util.h
+ unaligned.h util.c util.h \
+ hackypar.c hackypar.h
+DISTSUBDIRS:=debian/conffiles debian/copyright debian/changelog \
+ debian/control debian/init debian/rules
%.c: %.y
%.yy.c: %.fl
flex -o$@ $<
%.c: %.y
%.yy.c: %.fl
flex -o$@ $<
-%.tab.c: %.y
+%.tab.c
%.tab.h
: %.y
bison -d -o $@ $<
bison -d -o $@ $<
+%.o: %.c
+ $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
all: $(TARGETS)
all: $(TARGETS)
@@
-84,7
+96,7
@@
${srcdir}/configure: configure.in
# autoheader might not change config.h.in, so touch a stamp file.
${srcdir}/config.h.in: stamp-h.in
# autoheader might not change config.h.in, so touch a stamp file.
${srcdir}/config.h.in: stamp-h.in
-${srcdir}/stamp-h.in: configure.in
config.h.top config.h.bot
+${srcdir}/stamp-h.in: configure.in
cd ${srcdir} && autoheader
echo timestamp > ${srcdir}/stamp-h.in
cd ${srcdir} && autoheader
echo timestamp > ${srcdir}/stamp-h.in
@@
-106,7
+118,7
@@
DEPENDS:=$(OBJECTS:.o=.d)
$(DEPENDS): ${srcdir}/depend.sh
%.d: %.c
$(DEPENDS): ${srcdir}/depend.sh
%.d: %.c
- ${srcdir}/depend.sh $(srcdir) $(CFLAGS) $< > $@
+ ${srcdir}/depend.sh $(srcdir) $(C
PPFLAGS) $(ALL_C
FLAGS) $< > $@
-include $(DEPENDS)
-include $(DEPENDS)
@@
-116,6
+128,7
@@
conffile.tab.c: conffile.y
# End of manual dependencies section
secnet: $(OBJECTS)
# End of manual dependencies section
secnet: $(OBJECTS)
+ $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
version.c: Makefile
echo "char version[]=\"secnet $(VERSION)\";" >version.c
version.c: Makefile
echo "char version[]=\"secnet $(VERSION)\";" >version.c
@@
-140,7
+153,9
@@
pfname:=$(PACKAGE)-$(VERSION)
dist:
$(RM) -rf $(pfname)
mkdir $(pfname)
dist:
$(RM) -rf $(pfname)
mkdir $(pfname)
+ for i in $(DISTDIRS) ; do mkdir $(pfname)/$$i ; done
for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
- tar hcf ../$(pfname).tar $(pfname)
+ for i in $(DISTSUBDIRS) ; do ln -s ../../$(srcdir)/$$i $(pfname)/$$i ; done
+ tar hcf ../$(pfname).tar --exclude=CVS --exclude=.cvsignore $(pfname)
gzip -9f ../$(pfname).tar
$(RM) -rf $(pfname)
gzip -9f ../$(pfname).tar
$(RM) -rf $(pfname)