From 01a1acbceb5d8f670db32d9eb36fd5b6b4f6fdda Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Wed, 23 Jul 2014 05:51:55 -0700 Subject: [PATCH] Replace INCLUDES variable deprecated by automake 1.7 with AM_CPPFLAGS --- helpers/basic_auth/MSNT/Makefile.am | 2 +- helpers/basic_auth/NCSA/Makefile.am | 2 +- helpers/basic_auth/NIS/Makefile.am | 2 +- helpers/basic_auth/RADIUS/Makefile.am | 2 +- helpers/basic_auth/SSPI/Makefile.am | 2 +- helpers/digest_auth/LDAP/Makefile.am | 2 +- helpers/digest_auth/eDirectory/Makefile.am | 3 +-- helpers/digest_auth/file/Makefile.am | 2 +- helpers/external_acl/kerberos_ldap_group/Makefile.am | 2 +- helpers/negotiate_auth/kerberos/Makefile.am | 2 +- helpers/ntlm_auth/fake/Makefile.am | 2 +- helpers/ntlm_auth/smb_lm/Makefile.am | 2 +- lib/libTrie/test/Makefile.am | 4 ++-- lib/ntlmauth/Makefile.am | 2 +- lib/rfcnb/Makefile.am | 2 +- lib/smblib/Makefile.am | 2 +- lib/snmplib/Makefile.am | 10 +++++----- src/Common.am | 6 +++--- src/Makefile.am | 8 ++++---- src/fs/Makefile.am | 2 +- src/repl/Makefile.am | 2 +- test-suite/Makefile.am | 2 +- tools/Makefile.am | 2 +- 23 files changed, 33 insertions(+), 34 deletions(-) diff --git a/helpers/basic_auth/MSNT/Makefile.am b/helpers/basic_auth/MSNT/Makefile.am index 096c0c3875..4ce544b376 100644 --- 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 8e00bcae66..bd2b29fcbf 100644 --- 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 8cba4ce4c9..65acb2dc63 100644 --- 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 db47241e92..bb92ad1786 100644 --- 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 67b708b7e0..aa7c8e9ee1 100644 --- 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 0288bdfdf8..a3fd133d4f 100644 --- 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 9e52f2b2be..26f5e36dd8 100644 --- 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 dd379cd5a6..c6c20cb207 100644 --- 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 4b82ac10b4..3ffb95df43 100644 --- 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 bf7a1f9999..07c7bb7631 100644 --- 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 faaa636f39..f3ed900517 100644 --- 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 5560c49a5f..7a3ea5a3f9 100644 --- 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 700ae41071..f9c4ef192d 100644 --- 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 762f0d9e3e..fbb356bbbf 100644 --- 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 ef8953ab33..b3711703c6 100644 --- 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 50c3618e06..39d883db5d 100644 --- 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 11a255c0ec..d00bcee380 100644 --- 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 11c03c3513..dc188dfdde 100644 --- 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 c1f3baf9bd..2b3caff2d4 100644 --- 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 208ef8259f..09be65e111 100644 --- 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 6985a4a0b9..4c996409ae 100644 --- 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 9ea73ca160..5a6a3d5ef6 100644 --- 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 18da335213..66d30c713b 100644 --- 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 = -- 2.47.3