- Updated CVS_CREATED to remove intl/ directory and some other

  autogenerated files.
- Checked if all INCLUDES/LIBS/etc directives inherit the global variables.

diff --git a/Makefile.am b/Makefile.am
index a16fc0c..bda83a2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,8 @@ EXTRA_DIST = system.h ABOUT-NLS COPYING.README autogen.sh
 
 CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
  config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am ChangeLog
+ stamp-h.in m4/Makefile.am ChangeLog po/Makefile.in.in \
+ po/tinc.pot src/.libs intl
 
 ChangeLog:
        rm -f ChangeLog
@@ -18,7 +19,7 @@ ChangeLog:
 
 cvs-clean: maintainer-clean
        for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-         rm -f "$$f"; \
+         rm -Rf "$$f"; \
        done
 
 deb:

diff --git a/autogen.sh b/autogen.sh
index 9e3c045..344fbfa 100644 (file)
--- a/autogen.sh
+++ b/autogen.sh
@@ -70,9 +70,6 @@ if test "$DIE" -eq 1; then
   exit 1
 fi
 
-# Make sure configure doesn't complain about old configuration
-rm -f config.status
-
 if test -z "$*"; then
   echo "**Warning**: I am going to run \`configure' with no arguments."
   echo "If you wish to pass any to it, please specify them on the"

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f7f2798..aa4d55a 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in
-# $Id: Makefile.am,v 1.2.4.6 2001/01/05 23:50:55 guus Exp $
+# $Id: Makefile.am,v 1.2.4.7 2001/02/11 11:50:09 guus Exp $
 
 noinst_LIBRARIES = libvpn.a
 
-INCLUDES = -I. -I$(top_builddir) -I$(top_srcdir)/intl
+INCLUDES = @INCLUDES@ -I. -I$(top_builddir) -I$(top_srcdir)/intl
 
 libvpn_a_SOURCES = xmalloc.c pidfile.c utils.c getopt.c getopt1.c list.c avl_tree.c dropin.c
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 27a891e..1f6b44b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,12 @@
 ## Produce this file with automake to get Makefile.in
-# $Id: Makefile.am,v 1.4.4.11 2000/12/22 17:15:26 zarq Exp $
+# $Id: Makefile.am,v 1.4.4.12 2001/02/11 11:50:09 guus Exp $
 
 sbin_PROGRAMS = tincd
 
 tincd_SOURCES = conf.c connection.c meta.c net.c netutl.c process.c    \
        protocol.c subnet.c tincd.c
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/intl
+INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 
 noinst_HEADERS = conf.h connection.h meta.h net.h netutl.h process.h   \
        protocol.h subnet.h