Require full path to compat when included

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 86c51f11a95fd11c8e50ae75357a33dd552fec83..d11bc80367b42331dba1fd2fc07d1d5e6c5af467 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -105,7 +105,11 @@ libntlmauth_a_LIBADD = \
 libsspwin32_a_SOURCES = \
        sspwin32.c
 
-INCLUDES       = -I$(top_builddir)/include -I$(top_srcdir)/include @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/libsquid-compat
+INCLUDES = \
+       -I$(top_srcdir) \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include \
+       @SQUID_CPPUNIT_INC@
 ##FIXME - set these in configure.in and reuse
 
 check_PROGRAMS= \

diff --git a/libsquid-compat/Makefile.am b/libsquid-compat/Makefile.am
index 62b680d6c4e627d8af3a6c7f0f0ef5f47391e834..9565d4ecfe4de07ba43338809c4346dc9ddd03b1 100644 (file)
--- a/libsquid-compat/Makefile.am
+++ b/libsquid-compat/Makefile.am
@@ -9,7 +9,13 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@
 DEFS = @DEFS@
 CLEANFILES = 
 
-INCLUDES = -I. -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
+INCLUDES = \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/include \
+       -I$(top_builddir)/lib \
+       @SQUID_CPPUNIT_INC@
+
 $(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
 
 # Ideally this would be 100% inline functions and macro wrappers.

diff --git a/snmplib/Makefile.am b/snmplib/Makefile.am
index bac6f1bec56d0ec0bb9fdc47e62da3a5590d5768..30d2512aeaa3b15d24e8c143e54f7d09e623518c 100644 (file)
--- a/snmplib/Makefile.am
+++ b/snmplib/Makefile.am
@@ -10,7 +10,11 @@ libsnmp_a_SOURCES  = asn1.c parse.c snmp_vars.c \
        mib.c snmp_api_error.c   \
        snmp_msg.c \
        snmp_pdu.c  snmplib_debug.c
-INCLUDES       = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/libsquid-compat
+
+INCLUDES = \
+       -I$(top_srcdir) \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
 
 VERSION                = 3.4
 DEFS           = -DSQUID_SNMP=1

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9147394ef8bbd2744fd8f233a9a1a5c813854edc..c9cbf46feede06a0940dcfa3341dade9f23fa804 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,9 +7,15 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include -I$(top_srcdir)/src
-INCLUDES       += -I$(top_srcdir)/libsquid-compat
-INCLUDES       += @SQUID_CPPUNIT_INC@
+INCLUDES = \
+       -I$(top_srcdir) \
+       -I. \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src \
+       @SQUID_CPPUNIT_INC@
+#      -I$(top_srcdir)/lib/libTrie/include
+#      -I$(srcdir)
 
 TESTS=$(check_PROGRAMS)
 #check_PROGRAMS= testHeaders