[libcw-cvs] [CVS] Module src

[Carlo W. <li...@us...>]

CVSROOT    : /cvsroot/libcw
Module     : src
Commit time: 2002-00-06 17:59:41 UTC

Modified files:
     libcwd/Makefile.am libcwd/tests/Makefile.am
     libcwd/utils/Makefile.am

Log message:

Also stop automake 1.5 from using more include directories then we need.

---------------------- diff included ----------------------
Index: src/libcwd/Makefile.am
diff -u src/libcwd/Makefile.am:1.36 src/libcwd/Makefile.am:1.37
--- src/libcwd/Makefile.am:1.36	Sun Dec 30 12:00:01 2001
+++ src/libcwd/Makefile.am	Sun Jan  6 09:59:31 2002
@@ -13,7 +13,8 @@
 DEBUGOPTS = @DEBUGOPTS@
 WARNOPTS = @WARNOPTS@
 CXXFLAGS = -DCWDEBUG $(DEBUGOPTS) $(EXTRAOPTS) $(WARNOPTS)
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/include -I$(srcdir)/include
+INCLUDES = -I$(top_builddir)/include -I$(srcdir)/include
+DEFAULT_INCLUDES =
 
 lib_LTLIBRARIES = libcwd.la
 
Index: src/libcwd/tests/Makefile.am
diff -u src/libcwd/tests/Makefile.am:1.18 src/libcwd/tests/Makefile.am:1.19
--- src/libcwd/tests/Makefile.am:1.18	Sat Dec 29 20:17:50 2001
+++ src/libcwd/tests/Makefile.am	Sun Jan  6 09:59:31 2002
@@ -39,8 +39,9 @@
 DEBUGOPTS = @DEBUGOPTS@
 WARNOPTS = @WARNOPTS@
 TESTOPTS = @TESTOPTS@
-CXXFLAGS = $(DEBUGOPTS) $(TESTOPTS) $(EXTRAOPTS) $(WARNOPTS)
-INCLUDES = -I. -I$(top_builddir)/include -I$(srcdir)/../include -DCWDEBUG
+CXXFLAGS = -DCWDEBUG $(DEBUGOPTS) $(TESTOPTS) $(EXTRAOPTS) $(WARNOPTS)
+INCLUDES = -I. -I$(top_builddir)/include -I$(srcdir)/../include
+DEFAULT_INCLUDES =
 
 MAINTAINERCLEANFILES = Makefile.in
 
Index: src/libcwd/utils/Makefile.am
diff -u src/libcwd/utils/Makefile.am:1.10 src/libcwd/utils/Makefile.am:1.11
--- src/libcwd/utils/Makefile.am:1.10	Sat Dec 29 20:17:51 2001
+++ src/libcwd/utils/Makefile.am	Sun Jan  6 09:59:31 2002
@@ -7,8 +7,9 @@
 EXTRAOPTS = @EXTRAOPTS@
 DEBUGOPTS = @DEBUGOPTS@
 WARNOPTS = @WARNOPTS@
-CXXFLAGS = $(DEBUGOPTS) $(EXTRAOPTS) $(WARNOPTS)
-INCLUDES = -I$(srcdir)/../include -I$(top_builddir)/include -DCWDEBUG
+CXXFLAGS = -DCWDEBUG $(DEBUGOPTS) $(EXTRAOPTS) $(WARNOPTS)
+INCLUDES = -I$(srcdir)/../include -I$(top_builddir)/include
+DEFAULT_INCLUDES =
 LIBS=
 
 libutils_la_SOURCES = \
----------------------- End of diff -----------------------