Browse Source

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).
master
Richard B. Kreckel 16 years ago
parent
commit
55a8c69cf2
  1. 1
      benchmarks/Makefile.am
  2. 1
      examples/Makefile.am
  3. 1
      src/Makefile.am
  4. 1
      tests/Makefile.am

1
benchmarks/Makefile.am

@ -13,6 +13,7 @@ timebench2b_SOURCES = timebench2b.cc
timebench2b_LDADD = ../src/libcln.la timebench2b_LDADD = ../src/libcln.la
AM_CPPFLAGS = -I../include -I$(top_srcdir)/include AM_CPPFLAGS = -I../include -I$(top_srcdir)/include
DEFAULT_INCLUDES = -I.@am__isrc@
EXTRA_DIST = README bench2.txt timebench2.sh EXTRA_DIST = README bench2.txt timebench2.sh

1
examples/Makefile.am

@ -27,3 +27,4 @@ pi_LDADD = ../src/libcln.la
AM_CPPFLAGS = -I../include -I$(top_srcdir)/include AM_CPPFLAGS = -I../include -I$(top_srcdir)/include
DEFAULT_INCLUDES = -I.@am__isrc@

1
src/Makefile.am

@ -1,6 +1,7 @@
lib_LTLIBRARIES = libcln.la lib_LTLIBRARIES = libcln.la
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/include -I$(top_builddir)/src 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_LDFLAGS = -version-info $(LT_VERSION_INFO)
libcln_la_SOURCES = \ libcln_la_SOURCES = \

1
tests/Makefile.am

@ -44,6 +44,7 @@ EXTRA_PROGRAMS = $(ALL_TIMINGS)
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-I$(top_builddir)/include -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/src
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/autoconf
exam_SOURCES = exam.h exam.cc \ exam_SOURCES = exam.h exam.cc \

Loading…
Cancel
Save