Replace INCLUDES variable deprecated by automake 1.7 with AM_CPPFLAGS

diff --git a/helpers/basic_auth/MSNT/Makefile.am b/helpers/basic_auth/MSNT/Makefile.am
index 096c0c38759da5ddbf89748fd19c671feda466b8..4ce544b3764d614b9b534e12c1bad78c8106445a 100644 (file)
--- a/helpers/basic_auth/MSNT/Makefile.am
+++ b/helpers/basic_auth/MSNT/Makefile.am
@@ -34,7 +34,7 @@ LDADD = \
        $(XTRA_LIBS)
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir) -I$(top_srcdir)/lib
+AM_CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/lib
 
 
 install-data-local: msntauth.conf.default

diff --git a/helpers/basic_auth/NCSA/Makefile.am b/helpers/basic_auth/NCSA/Makefile.am
index 8e00bcae667ae0779799e6cefa0901e53f1051f8..bd2b29fcbf6f259720f9c3d172ac45fc786e1bc0 100644 (file)
--- a/helpers/basic_auth/NCSA/Makefile.am
+++ b/helpers/basic_auth/NCSA/Makefile.am
@@ -14,4 +14,4 @@ LDADD = \
        $(XTRA_LIBS)
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)

diff --git a/helpers/basic_auth/NIS/Makefile.am b/helpers/basic_auth/NIS/Makefile.am
index 8cba4ce4c9878c24666aede91bc2e8914c6a58a7..65acb2dc63be6323c768f77891c0a50baaab20d7 100644 (file)
--- a/helpers/basic_auth/NIS/Makefile.am
+++ b/helpers/basic_auth/NIS/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 libexec_PROGRAMS = basic_nis_auth
 

diff --git a/helpers/basic_auth/RADIUS/Makefile.am b/helpers/basic_auth/RADIUS/Makefile.am
index db47241e922c2396d983df8738ca9a972601128a..bb92ad1786094fae08f42679931af99e2db30237 100644 (file)
--- a/helpers/basic_auth/RADIUS/Makefile.am
+++ b/helpers/basic_auth/RADIUS/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 libexec_PROGRAMS       = basic_radius_auth
 man_MANS               = basic_radius_auth.8

diff --git a/helpers/basic_auth/SSPI/Makefile.am b/helpers/basic_auth/SSPI/Makefile.am
index 67b708b7e0a3e0632a682f3cd1836164ba583f39..aa7c8e9ee17d7298344bbabb32ef155aa2411669 100644 (file)
--- a/helpers/basic_auth/SSPI/Makefile.am
+++ b/helpers/basic_auth/SSPI/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 if ENABLE_WIN32SPECIFIC
 libexec_PROGRAMS = basic_sspi_auth

diff --git a/helpers/digest_auth/LDAP/Makefile.am b/helpers/digest_auth/LDAP/Makefile.am
index 0288bdfdf8384ac6adeecf9adb863a71adeec548..a3fd133d4f08f439bfc24a0c73022753a1dd2e76 100644 (file)
--- a/helpers/digest_auth/LDAP/Makefile.am
+++ b/helpers/digest_auth/LDAP/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 libexec_PROGRAMS = digest_ldap_auth
 digest_ldap_auth_SOURCES = digest_pw_auth.cc \

diff --git a/helpers/digest_auth/eDirectory/Makefile.am b/helpers/digest_auth/eDirectory/Makefile.am
index 9e52f2b2be3d5c5b673dc084db338aa58c7cd4cb..26f5e36dd87242d47793268c00d6481ee7692be7 100644 (file)
--- a/helpers/digest_auth/eDirectory/Makefile.am
+++ b/helpers/digest_auth/eDirectory/Makefile.am
@@ -1,8 +1,7 @@
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
-
+AM_CPPFLAGS += -I$(srcdir)
 
 libexec_PROGRAMS = digest_edirectory_auth
 digest_edirectory_auth_SOURCES = digest_pw_auth.cc \

diff --git a/helpers/digest_auth/file/Makefile.am b/helpers/digest_auth/file/Makefile.am
index dd379cd5a625d46f73d1b5ccff710280260d9b12..c6c20cb2079fc7315443f8750cecb31797705ffa 100644 (file)
--- a/helpers/digest_auth/file/Makefile.am
+++ b/helpers/digest_auth/file/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 man_MANS = digest_file_auth.8
 libexec_PROGRAMS = digest_file_auth

diff --git a/helpers/external_acl/kerberos_ldap_group/Makefile.am b/helpers/external_acl/kerberos_ldap_group/Makefile.am
index 4b82ac10b4da7a378848efe7dcf0a6fcd7c105ed..3ffb95df434acec8c22d9559d3161311322e53c2 100644 (file)
--- a/helpers/external_acl/kerberos_ldap_group/Makefile.am
+++ b/helpers/external_acl/kerberos_ldap_group/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/src/Common.am
 EXTRA_DIST = README required.m4 cert_tool ext_kerberos_ldap_group_acl.8
 SUBDIRS = 
 
-AM_CPPFLAGS = $(INCLUDES) -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 libexec_SCRIPTS = cert_tool
 

diff --git a/helpers/negotiate_auth/kerberos/Makefile.am b/helpers/negotiate_auth/kerberos/Makefile.am
index bf7a1f99998957abc029ba06e0f8ec576ae6708c..07c7bb7631aa71f470035c307491a9c3bfbcb499 100644 (file)
--- a/helpers/negotiate_auth/kerberos/Makefile.am
+++ b/helpers/negotiate_auth/kerberos/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 
 libexec_PROGRAMS = negotiate_kerberos_auth negotiate_kerberos_auth_test
 
-AM_CPPFLAGS = $(INCLUDES) -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 negotiate_kerberos_auth_SOURCES = negotiate_kerberos_auth.cc negotiate_kerberos_pac.cc negotiate_kerberos.h
 negotiate_kerberos_auth_LDFLAGS = 

diff --git a/helpers/ntlm_auth/fake/Makefile.am b/helpers/ntlm_auth/fake/Makefile.am
index faaa636f39e43a85b82314e4eb1684a33d24c7c6..f3ed9005174d3e301bfcb3c2342a1ee8d50bda91 100644 (file)
--- a/helpers/ntlm_auth/fake/Makefile.am
+++ b/helpers/ntlm_auth/fake/Makefile.am
@@ -11,7 +11,7 @@ ntlm_fake_auth_LDADD = \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
 
-INCLUDES += -I$(top_srcdir)/lib
+AM_CPPFLAGS += -I$(top_srcdir)/lib
 
 ## Demo using perl.
 ## ntlm_fake_auth.pl: ntlm_fake_auth.pl.in

diff --git a/helpers/ntlm_auth/smb_lm/Makefile.am b/helpers/ntlm_auth/smb_lm/Makefile.am
index 5560c49a5fd919180c0bb441f5e95c31ea491e16..7a3ea5a3f9802430e9cc68a9272f5b0456afe0e8 100644 (file)
--- a/helpers/ntlm_auth/smb_lm/Makefile.am
+++ b/helpers/ntlm_auth/smb_lm/Makefile.am
@@ -13,6 +13,6 @@ ntlm_smb_lm_auth_LDADD = \
        $(CRYPTLIB) \
        $(XTRA_LIBS)
 
-INCLUDES += -I$(top_srcdir)/lib
+AM_CPPFLAGS += -I$(top_srcdir)/lib
 
 EXTRA_DIST = required.m4

diff --git a/lib/libTrie/test/Makefile.am b/lib/libTrie/test/Makefile.am
index 700ae41071e6bb766951495ef33a221ca068a56c..f9c4ef192d53a42dd81f4007f2dfb8ab941d7cb0 100644 (file)
--- a/lib/libTrie/test/Makefile.am
+++ b/lib/libTrie/test/Makefile.am
@@ -1,10 +1,10 @@
 include $(top_srcdir)/src/Common.am
 
-INCLUDES += -I$(top_srcdir)/include
+AM_CPPFLAGS += -I$(top_srcdir)/include
 
 TESTS += trie
 
 check_PROGRAMS += trie
 
 trie_SOURCES = trie.cc
-trie_LDADD = $(top_builddir)/lib/libTrie/libTrie.a
\ No newline at end of file
+trie_LDADD = $(top_builddir)/lib/libTrie/libTrie.a

diff --git a/lib/ntlmauth/Makefile.am b/lib/ntlmauth/Makefile.am
index 762f0d9e3e4d621b9dd25012e9d44224476d19b5..fbb356bbbfea97fda7895325aabd71852649c698 100644 (file)
--- a/lib/ntlmauth/Makefile.am
+++ b/lib/ntlmauth/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
-INCLUDES += -I$(top_srcdir)/lib
+AM_CPPFLAGS += -I$(top_srcdir)/lib
 
 noinst_LTLIBRARIES = libntlmauth.la
 

diff --git a/lib/rfcnb/Makefile.am b/lib/rfcnb/Makefile.am
index ef8953ab334062ff2470fb85dff5b1f63294777f..b3711703c6c2a0057326fdbc87ebf619074a5df6 100644 (file)
--- a/lib/rfcnb/Makefile.am
+++ b/lib/rfcnb/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/src/Common.am
 
-INCLUDES += -I$(top_srcdir)/lib
+AM_CPPFLAGS += -I$(top_srcdir)/lib
 
 noinst_LTLIBRARIES = librfcnb.la
 

diff --git a/lib/smblib/Makefile.am b/lib/smblib/Makefile.am
index 50c3618e06601f4029477e9bdbaa429c41505198..39d883db5df8655015ec053f909825b99dcf1bfc 100644 (file)
--- a/lib/smblib/Makefile.am
+++ b/lib/smblib/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/src/Common.am
 
-INCLUDES += -I$(top_srcdir)/lib
+AM_CPPFLAGS += -I$(top_srcdir)/lib
 
 noinst_LTLIBRARIES = libsmblib.la
 

diff --git a/lib/snmplib/Makefile.am b/lib/snmplib/Makefile.am
index 11a255c0eca2b429fe8d0885ae5883a73a8de672..d00bcee3802d0725d7ca02957410f5428edb5c47 100644 (file)
--- a/lib/snmplib/Makefile.am
+++ b/lib/snmplib/Makefile.am
@@ -4,6 +4,11 @@
 ## 
 AM_CFLAGS = $(SQUID_CFLAGS)
 AM_CXXFLAGS = $(SQUID_CXXFLAGS)
+AM_CPPFLAGS = \
+       -I$(top_srcdir) \
+       -I$(top_builddir)/include \
+       -I$(top_srcdir)/include
+
 noinst_LTLIBRARIES = libsnmplib.la
 libsnmplib_la_SOURCES  = asn1.c parse.c snmp_vars.c \
        coexistance.c snmp_api.c snmp_error.c  \
@@ -11,10 +16,5 @@ libsnmplib_la_SOURCES  = asn1.c parse.c snmp_vars.c \
        snmp_msg.c \
        snmp_pdu.c  snmplib_debug.c
 
-INCLUDES = \
-       -I$(top_srcdir) \
-       -I$(top_builddir)/include \
-       -I$(top_srcdir)/include
-
 VERSION                = 3.4
 DEFS           = -DSQUID_SNMP=1

diff --git a/src/Common.am b/src/Common.am
index 11c03c35131bd08121019e84c403f28d8c25866c..dc188dfdde033dfb977fb5672bbc82828cd8a161 100644 (file)
--- a/src/Common.am
+++ b/src/Common.am
@@ -13,7 +13,7 @@ CLEANFILES =
 check_PROGRAMS = 
 TESTS =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/lib \
@@ -23,12 +23,12 @@ INCLUDES = \
 
 ## Kerberos headers require their include path.
 ## Because we use libcompat for comm_err.h header protections ...
-INCLUDES += $(KRB5INCS)
+AM_CPPFLAGS += $(KRB5INCS)
 
 ## Loadable Modules requires LTDL include paths.
 ## Because we need this to use the libray linking headers...
 if ENABLE_LOADABLE_MODULES
-INCLUDES += $(INCLTDL)
+AM_CPPFLAGS += $(INCLTDL)
 endif
 
 ## make all compiled sources depend on generated files

diff --git a/src/Makefile.am b/src/Makefile.am
index c1f3baf9bdde09e04ea626641d369e6c91db82aa..2b3caff2d47795816fbfd28a01d978632041d345 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -234,7 +234,7 @@ cf_gen_LDADD=
 cf_gen.$(OBJEXT): cf_gen_defines.cci
 
 ## cf_gen.cc needs src/cf_gen_defines.cci
-INCLUDES += -I$(top_builddir)/src
+AM_CPPFLAGS += -I$(top_builddir)/src
 
 
 ACL_REGISTRATION_SOURCES = AclRegs.cc AuthReg.cc
@@ -686,11 +686,11 @@ squid_LDFLAGS = -export-dynamic -dlopen force
 ## squid_LDFLAGS = -all-static -dlopen self
 ##
 ## LTDL headers require their local include path...
-INCLUDES += $(INCLTDL)
+AM_CPPFLAGS += $(INCLTDL)
 endif
 
 ## Kerberos libraries require their include path...
-INCLUDES += $(KRB5INCS)
+AM_CPPFLAGS += $(KRB5INCS)
 
 
 unlinkd_SOURCES = unlinkd_daemon.cc
@@ -3447,7 +3447,7 @@ tests_testRock_LDADD = \
        $(SSLLIB) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
-tests_testRock_LDFLAGS = $(INCLUDES) $(LIBADD_DL)
+tests_testRock_LDFLAGS = $(AM_CPPFLAGS) $(LIBADD_DL)
 tests_testRock_DEPENDENCIES = \
        $(SWAP_TEST_DS)
 

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 208ef8259f7978313e90d35fe0fa9bf721764a0d..09be65e111c3a838dfa802ddb34d6c81c2a789ed 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -47,7 +47,7 @@ libfs_la_LIBADD =  $(STORE_LIBS_TO_BUILD)
 libfs_la_DEPENDENCIES = $(STORE_LIBS_TO_BUILD)
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 
 ## targets below to emulate distributed makefiles

diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am
index 6985a4a0b9e25a82e6871a5d22ca110fa54f9ca7..4c996409aed7e6a63e6f405c8251cc12f1c5c9f6 100644 (file)
--- a/src/repl/Makefile.am
+++ b/src/repl/Makefile.am
@@ -3,7 +3,7 @@
 include $(top_srcdir)/src/Common.am
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 AUTOMAKE_OPTIONS = subdir-objects
 

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 9ea73ca16019788d407d6da56e0097a2282dfbb3..5a6a3d5ef6a09dfe4e6a09042208bb6edc731ac6 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/src/Common.am
 AUTOMAKE_OPTIONS = subdir-objects
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 LDADD = \
        $(top_builddir)/src/base/libbase.la \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 18da3352135a55030d0978e2364439927a977660..66d30c713b121a5ac2fb5755de4409cf2d2e7d72 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -9,7 +9,7 @@ include $(top_srcdir)/src/Common.am
 AUTOMAKE_OPTIONS = subdir-objects
 
 ## we need our local files too (but avoid -I. at all costs)
-INCLUDES += -I$(srcdir)
+AM_CPPFLAGS += -I$(srcdir)
 
 SUBDIRS = purge squidclient
 EXTRA_DIST =