Makefile.in: Handle conffile.yy.h properly

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a6ac640cc14c43cea08962a8ad9435f4f291306c..06ea112c6bac31d920f7f0422eaa29f7587c1ffd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.3.4
+VERSION:=0.4.0~~iwj~
 
 @SET_MAKE@
 
@@ -30,6 +30,15 @@ RM:=@RM@
 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 \
@@ -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)
-CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
+CPPFLAGS:=@CPPFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' $(EXTRA_CPPFLAGS)
 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 \
+       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@ \
@@ -83,7 +86,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
@@ -165,6 +168,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,6 +182,8 @@ install: installdirs
        $(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-force:
@@ -185,7 +191,7 @@ install-force:
        $(MAKE) install
 
 clean:
-       $(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
+       $(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
        $(RM) -f *.d *~ eax-*-test.confirm eax-*-test
 
 realclean:     clean