Import release 0.1.15

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 02103131ee7e1911724c2454f4755e63aa9dfd40..af33bf56d8f5e8c26d487306877aa814a229bd3e 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.14
+VERSION:=0.1.15

 
 @SET_MAKE@
 
 
 @SET_MAKE@
 


@@ -31,7 +31,8 @@ CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 

-CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I$(srcdir) -I.
+CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)

 LDFLAGS:=@LDFLAGS@
 LDLIBS:=@LIBS@
 
 LDFLAGS:=@LDFLAGS@
 LDLIBS:=@LIBS@
 


@@ -75,6 +76,8 @@ DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
 %.tab.c:       %.y
        bison -d -o $@ $<
 
 %.tab.c:       %.y
        bison -d -o $@ $<
 

+%.o: %.c
+       $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@

 
 all:   $(TARGETS)
 
 
 all:   $(TARGETS)
 


@@ -106,7 +109,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) $(ALL_CFLAGS) $< > $@

 
 -include $(DEPENDS)
 
 
 -include $(DEPENDS)
 


@@ -116,6 +119,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


@@ -141,6 +145,6 @@ dist:
        $(RM) -rf $(pfname)
        mkdir $(pfname)
        for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
        $(RM) -rf $(pfname)
        mkdir $(pfname)
        for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done

-       tar hcf ../$(pfname).tar $(pfname)
+       tar hcf ../$(pfname).tar --exclude=CVS --exclude=.cvsignore $(pfname)

        gzip -9f ../$(pfname).tar
        $(RM) -rf $(pfname)
        gzip -9f ../$(pfname).tar
        $(RM) -rf $(pfname)