From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 7 Feb 2009 11:28:44 +0000 (+1300)
Subject: Require full path to compat when included
X-Git-Tag: SQUID_3_2_0_1~1190^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c7ce377938c99c477522f4d44a8dd9f2de3ebac;p=thirdparty%2Fsquid.git

Require full path to compat when included
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 86c51f11a9..d11bc80367 100644
--- 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 62b680d6c4..9565d4ecfe 100644
--- 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 bac6f1bec5..30d2512aea 100644
--- 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 9147394ef8..c9cbf46fee 100644
--- 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