Override automake's DEFAULT_INCLUDES.

Automake adds all kinds of subdirectories to -I, the list of directories
to be searched for header files. However, CLN's header files are not
supposed to be included without the cln/ subdirectory, so adding
-Iinclude/cln can lead to conflicts with other header files. (The
problem at hand was a conflict between CLN's string.h and the C
library's string.h).

diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index a93dd14effe93ee443717dfaab0d7a492cdd03ca..3d3dfe68cc828ee82feeadb9b314a79b798397f5 100644 (file)
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -13,6 +13,7 @@ timebench2b_SOURCES = timebench2b.cc
 timebench2b_LDADD = ../src/libcln.la
 
 AM_CPPFLAGS = -I../include -I$(top_srcdir)/include
+DEFAULT_INCLUDES = -I.@am__isrc@
 
 EXTRA_DIST = README bench2.txt timebench2.sh
 

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 627d72cad070dba84123c5e287797957f5c5d4f2..e20a75fcaafae1472085a7d0b6f22a683c1db247 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -27,3 +27,4 @@ pi_LDADD = ../src/libcln.la
 
 
 AM_CPPFLAGS = -I../include -I$(top_srcdir)/include
+DEFAULT_INCLUDES = -I.@am__isrc@

diff --git a/src/Makefile.am b/src/Makefile.am
index ae092bba33f3cf3d876f2e70ed9e07efb31d94cf..3b366899ee816564450e4697a5ead8cbd440f8bd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES = libcln.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/include -I$(top_builddir)/src
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/autoconf
 libcln_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
 
 libcln_la_SOURCES = \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e6a3acd2372d365b2e30368667363bd82424fd0c..1a3fd4c5b58a9f1b823dbddadd91062579d4032d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,6 +44,7 @@ EXTRA_PROGRAMS = $(ALL_TIMINGS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
 -I$(top_builddir)/include -I$(top_builddir)/src
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/autoconf
 
 
 exam_SOURCES = exam.h exam.cc \