You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2018/03/06 03:23:07 UTC
[trafficserver] branch master updated: Fix default include path
ordering.
This is an automated email from the ASF dual-hosted git repository.
jpeach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new df144ab Fix default include path ordering.
df144ab is described below
commit df144ab5668dd56d1f13418dee0c3910c44dc44c
Author: James Peach <jp...@apache.org>
AuthorDate: Thu Mar 1 22:18:41 2018 -0800
Fix default include path ordering.
Originally, prior to commit c7c9d0f7a, the configure phase
appended any include paths to `CPPFLAGS`. After c7c9d0f7a, they
were appended to `AM_CPPFLAGS`. Since automake always specifies
`AM_CPPFLAGS` before `CPPFLAGS` when it generated the compilation
commands, this had the effect of always including system (or
library) headers before any in-tree headers. However, we actually
want the reverse (i.e. the original semantics) because in the
case of a name collision we will always want to resolve the
in-tree name.
This problem caused the build to break on macOS 10.13 (with a
case-insensitive filesystem) because the in-tree `Transform.h`
was being resolved to the Tcl `transform.h`. Hijinks ensued.
The fix is simple but slightly ugly. We keep using `AM_CPPFLAGS`
for global defines, but create a `TS_INCLUDES` build variable for
the include path. This lets us control the include ordering and
ensure that the autoconfigured include paths are included last.
---
cmd/traffic_cop/Makefile.am | 6 ++++--
cmd/traffic_crashlog/Makefile.am | 3 ++-
cmd/traffic_ctl/Makefile.am | 3 ++-
cmd/traffic_layout/Makefile.am | 3 ++-
cmd/traffic_manager/Makefile.am | 3 ++-
cmd/traffic_top/Makefile.am | 1 +
cmd/traffic_via/Makefile.am | 3 ++-
cmd/traffic_wccp/Makefile.am | 4 +++-
configure.ac | 18 +++++++++++++-----
iocore/aio/Makefile.am | 3 ++-
iocore/cache/Makefile.am | 17 +++++++++--------
iocore/dns/Makefile.am | 3 ++-
iocore/eventsystem/Makefile.am | 3 ++-
iocore/hostdb/Makefile.am | 3 ++-
iocore/net/Makefile.am | 1 +
iocore/utils/Makefile.am | 3 ++-
lib/bindings/Makefile.am | 3 ++-
lib/records/Makefile.am | 3 ++-
lib/ts/Makefile.am | 7 ++++---
lib/tsconfig/Makefile.am | 3 ++-
lib/wccp/Makefile.am | 3 ++-
mgmt/Makefile.am | 3 ++-
mgmt/api/Makefile.am | 1 +
mgmt/utils/Makefile.am | 1 +
proxy/Makefile.am | 1 +
proxy/congest/Makefile.am | 3 ++-
proxy/hdrs/Makefile.am | 3 ++-
proxy/http/Makefile.am | 3 ++-
proxy/http/remap/Makefile.am | 3 ++-
proxy/http2/Makefile.am | 3 ++-
proxy/logging/Makefile.am | 3 ++-
proxy/shared/Makefile.am | 5 ++---
rc/Makefile.am | 8 --------
tests/unit_tests/Makefile.am | 3 ++-
tools/Makefile.am | 6 ++++--
35 files changed, 88 insertions(+), 54 deletions(-)
diff --git a/cmd/traffic_cop/Makefile.am b/cmd/traffic_cop/Makefile.am
index e1f4c89..b98512f 100644
--- a/cmd/traffic_cop/Makefile.am
+++ b/cmd/traffic_cop/Makefile.am
@@ -17,11 +17,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS += $(iocore_include_dirs) \
+AM_CPPFLAGS += \
+ $(iocore_include_dirs) \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/records \
-I$(abs_top_srcdir)/mgmt \
- -I$(abs_top_srcdir)/mgmt/api/include
+ -I$(abs_top_srcdir)/mgmt/api/include \
+ $(TS_INCLUDES)
AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
diff --git a/cmd/traffic_crashlog/Makefile.am b/cmd/traffic_crashlog/Makefile.am
index 6eaae07..fdb9d3e 100644
--- a/cmd/traffic_crashlog/Makefile.am
+++ b/cmd/traffic_crashlog/Makefile.am
@@ -23,7 +23,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/lib/records \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/utils \
- -I$(abs_top_srcdir)/mgmt/api/include
+ -I$(abs_top_srcdir)/mgmt/api/include \
+ $(TS_INCLUDES)
AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
diff --git a/cmd/traffic_ctl/Makefile.am b/cmd/traffic_ctl/Makefile.am
index 2d8b80b..2767097 100644
--- a/cmd/traffic_ctl/Makefile.am
+++ b/cmd/traffic_ctl/Makefile.am
@@ -22,7 +22,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/records \
-I$(abs_top_srcdir)/mgmt \
- -I$(abs_top_srcdir)/mgmt/api/include
+ -I$(abs_top_srcdir)/mgmt/api/include \
+ $(TS_INCLUDES)
bin_PROGRAMS = traffic_ctl
diff --git a/cmd/traffic_layout/Makefile.am b/cmd/traffic_layout/Makefile.am
index 7d43f90..eada9ab 100644
--- a/cmd/traffic_layout/Makefile.am
+++ b/cmd/traffic_layout/Makefile.am
@@ -22,7 +22,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/records \
-I$(abs_top_srcdir)/mgmt \
- -I$(abs_top_srcdir)/mgmt/utils
+ -I$(abs_top_srcdir)/mgmt/utils \
+ $(TS_INCLUDES)
AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am
index 3f02a99..716008f 100644
--- a/cmd/traffic_manager/Makefile.am
+++ b/cmd/traffic_manager/Makefile.am
@@ -30,7 +30,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/mgmt/api \
-I$(abs_top_srcdir)/mgmt/api/include \
-I$(abs_top_srcdir)/mgmt/utils \
- -I$(abs_top_srcdir)/lib
+ -I$(abs_top_srcdir)/lib \
+ $(TS_INCLUDES)
if BUILD_LUAJIT
AM_CPPFLAGS += \
diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am
index 03daddc..2723472 100644
--- a/cmd/traffic_top/Makefile.am
+++ b/cmd/traffic_top/Makefile.am
@@ -24,6 +24,7 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/lib/records \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/api/include \
+ $(TS_INCLUDES) \
@CURL_CFLAGS@ \
@CURSES_CFLAGS@
diff --git a/cmd/traffic_via/Makefile.am b/cmd/traffic_via/Makefile.am
index 02b7f54..bf19605 100644
--- a/cmd/traffic_via/Makefile.am
+++ b/cmd/traffic_via/Makefile.am
@@ -20,7 +20,8 @@
AM_CPPFLAGS += \
$(iocore_include_dirs) \
-I$(abs_top_srcdir)/lib \
- -I$(abs_top_srcdir)/mgmt/api/include
+ -I$(abs_top_srcdir)/mgmt/api/include \
+ $(TS_INCLUDES)
AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
diff --git a/cmd/traffic_wccp/Makefile.am b/cmd/traffic_wccp/Makefile.am
index 0a22d7e..8a6acb9 100644
--- a/cmd/traffic_wccp/Makefile.am
+++ b/cmd/traffic_wccp/Makefile.am
@@ -17,10 +17,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS += $(iocore_include_dirs) \
+AM_CPPFLAGS += \
+ $(iocore_include_dirs) \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/records \
-I$(abs_top_srcdir)/lib/wccp \
+ $(TS_INCLUDES) \
@OPENSSL_INCLUDES@
AM_LDFLAGS += \
diff --git a/configure.ac b/configure.ac
index 366d63c..7acee0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -655,7 +655,7 @@ case $host_os in
freebsd*)
host_os_def="freebsd"
AM_LDFLAGS="-rdynamic"
- TS_ADDTO(AM_CPPFLAGS, [-I/usr/local/include])
+ TS_ADDTO(TS_INCLUDES, [-I/usr/local/include])
TS_ADDTO(AM_CPPFLAGS, [-D_GLIBCXX_USE_C99])
TS_ADDTO(AM_CPPFLAGS, [-D_GLIBCXX_USE_C99_MATH])
TS_ADDTO(AM_CPPFLAGS, [-D_GLIBCXX_USE_C99_MATH_TR1])
@@ -663,7 +663,7 @@ case $host_os in
kfreebsd*)
host_os_def="freebsd"
AM_LDFLAGS="-rdynamic"
- TS_ADDTO(AM_CPPFLAGS, [-I/usr/local/include])
+ TS_ADDTO(TS_INCLUDES, [-I/usr/local/include])
TS_ADDTO(AM_CPPFLAGS, [-Dkfreebsd])
;;
openbsd*)
@@ -872,7 +872,7 @@ case $host_os_def in
# NOTE: This seems semi-kludgy, but useful for MacPorts I think.
AS_IF([test -d /opt/local/include], [
- TS_ADDTO(AM_CPPFLAGS, [-I/opt/local/include])
+ TS_ADDTO(TS_INCLUDES, [-I/opt/local/include])
])
AS_IF([test -d /opt/local/lib], [
TS_ADDTO(AM_LDFLAGS, [-L/opt/local/lib])
@@ -1247,7 +1247,7 @@ AC_SUBST([LIBTCL],[$TCL_LIB_SPEC])
if test "x${TCL_INCLUDE_SPEC}" != "x-I/usr/include"; then
- TS_ADDTO(AM_CPPFLAGS, [$TCL_INCLUDE_SPEC])
+ TS_ADDTO(TS_INCLUDES, [$TCL_INCLUDE_SPEC])
fi
AC_CHECK_FUNCS([clock_gettime kqueue epoll_ctl posix_fadvise posix_madvise posix_fallocate inotify_init])
@@ -1989,6 +1989,13 @@ AC_SUBST([AM_CXXFLAGS])
AC_SUBST([AM_LDFLAGS])
AC_SUBST([iocore_include_dirs])
+# NOTE: All additions to the default include path must be added to
+# TS_INCLUDES *not* to AM_CPPFLAGS. If you add then to AM_CPPFLAGS
+# then they are always prepended to the local AM_CPPFLAGS which risks
+# name collisions with in-tree files. We always want the in-tree files
+# to have precendence.
+AC_SUBST([TS_INCLUDES])
+
AS_IF([test "x$RPATH" != "x"], [
TS_ADDTO_RPATH([$RPATH])
])
@@ -2073,9 +2080,10 @@ AC_MSG_NOTICE([Build option summary:
AM@&t@_CXXFLAGS: $AM_CXXFLAGS
AM@&t@_CPPFLAGS: $AM_CPPFLAGS
AM@&t@_LDFLAGS: $AM_LDFLAGS
+ TS_INCLUDES: $TS_INCLUDES
OPENSSL_LDFLAGS: $OPENSSL_LDFLAGS
OPENSSL_INCLUDES: $OPENSSL_INCLUDES
LUAJIT_CFLAGS: $LUAJIT_CFLAGS
- LUAJIT_CPPFLAGS: $LUAJIT_CPPFLAGS
+ LUAJIT_CPPFLAGS: $LUAJIT_CPPFLAGS
LUAJIT_LDFLAGS: $LUAJIT_LDFLAGS
])
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index b130858..798337f 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -19,7 +19,8 @@
AM_CPPFLAGS += \
-I$(abs_top_srcdir)/iocore/eventsystem \
-I$(abs_top_srcdir)/lib \
- -I$(abs_top_srcdir)/lib/records
+ -I$(abs_top_srcdir)/lib/records \
+ $(TS_INCLUDES)
TESTS = test_AIO.sample
diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
index eaecfbb..26fcbbe 100644
--- a/iocore/cache/Makefile.am
+++ b/iocore/cache/Makefile.am
@@ -26,12 +26,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/proxy/shared \
-I$(abs_top_srcdir)/proxy/http/remap \
-I$(abs_top_srcdir)/mgmt \
- -I$(abs_top_srcdir)/mgmt/utils
-
-ADD_SRC =
-if BUILD_TESTS
- ADD_SRC += CacheTest.cc P_CacheTest.h
-endif
+ -I$(abs_top_srcdir)/mgmt/utils \
+ $(TS_INCLUDES)
noinst_LIBRARIES = libinkcache.a
@@ -62,8 +58,13 @@ libinkcache_a_SOURCES = \
P_RamCache.h \
RamCacheCLFUS.cc \
RamCacheLRU.cc \
- Store.cc \
- $(ADD_SRC)
+ Store.cc
+
+if BUILD_TESTS
+libinkcache_a_SOURCES += \
+ CacheTest.cc \
+ P_CacheTest.h
+endif
include $(top_srcdir)/build/tidy.mk
diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am
index d5c7186..df2d35e 100644
--- a/iocore/dns/Makefile.am
+++ b/iocore/dns/Makefile.am
@@ -24,7 +24,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/proxy/http \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/mgmt \
- -I$(abs_top_srcdir)/mgmt/utils
+ -I$(abs_top_srcdir)/mgmt/utils \
+ $(TS_INCLUDES)
noinst_LIBRARIES = libinkdns.a
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index c1d24f0..968bdd7 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -18,7 +18,8 @@
AM_CPPFLAGS += \
-I$(abs_top_srcdir)/lib \
- -I$(abs_top_srcdir)/lib/records
+ -I$(abs_top_srcdir)/lib/records \
+ $(TS_INCLUDES)
TESTS = $(check_PROGRAMS)
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index 5b58f50..7ee504c 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -24,7 +24,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/proxy/http \
-I$(abs_top_srcdir)/mgmt \
- -I$(abs_top_srcdir)/mgmt/utils
+ -I$(abs_top_srcdir)/mgmt/utils \
+ $(TS_INCLUDES)
EXTRA_DIST = I_HostDB.h
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
index ae329ab..0a4b0af 100644
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@ -27,6 +27,7 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/utils \
-I$(abs_top_srcdir)/proxy/http \
+ $(TS_INCLUDES) \
@OPENSSL_INCLUDES@
TESTS = $(check_PROGRAMS)
diff --git a/iocore/utils/Makefile.am b/iocore/utils/Makefile.am
index 289295d..89a1202 100644
--- a/iocore/utils/Makefile.am
+++ b/iocore/utils/Makefile.am
@@ -19,7 +19,8 @@
AM_CPPFLAGS += \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/records \
- -I$(abs_top_srcdir)/iocore/eventsystem
+ -I$(abs_top_srcdir)/iocore/eventsystem \
+ $(TS_INCLUDES)
noinst_LIBRARIES = libinkutils.a
diff --git a/lib/bindings/Makefile.am b/lib/bindings/Makefile.am
index b4a4737..d8fde00 100644
--- a/lib/bindings/Makefile.am
+++ b/lib/bindings/Makefile.am
@@ -21,7 +21,8 @@ include $(top_srcdir)/build/tidy.mk
AM_CPPFLAGS += \
$(LUAJIT_CPPFLAGS) \
-I$(abs_top_srcdir)/lib \
- -I$(abs_top_srcdir)/lib/records
+ -I$(abs_top_srcdir)/lib/records \
+ $(TS_INCLUDES)
noinst_LTLIBRARIES = libbindings.la
diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am
index 8ee82c0..d8c8eb5 100644
--- a/lib/records/Makefile.am
+++ b/lib/records/Makefile.am
@@ -24,7 +24,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/api/include \
-I$(abs_top_srcdir)/mgmt/utils \
- -I$(abs_top_srcdir)/lib
+ -I$(abs_top_srcdir)/lib \
+ $(TS_INCLUDES)
noinst_LIBRARIES = librecords_lm.a librecords_p.a librecords_cop.a
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index e41135a..6faa377 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -32,9 +32,10 @@ TESTS = $(check_PROGRAMS)
lib_LTLIBRARIES = libtsutil.la
AM_CPPFLAGS += \
- $(iocore_include_dirs) \
- -I$(abs_top_srcdir)/lib \
- -I$(abs_top_srcdir)/lib/records
+ $(iocore_include_dirs) \
+ -I$(abs_top_srcdir)/lib \
+ -I$(abs_top_srcdir)/lib/records \
+ $(TS_INCLUDES)
libtsutil_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@
libtsutil_la_LIBADD = \
diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am
index 4244b63..204cb73 100644
--- a/lib/tsconfig/Makefile.am
+++ b/lib/tsconfig/Makefile.am
@@ -24,7 +24,8 @@ AM_CFLAGS += @FLEX_CFLAGS@
AM_YFLAGS = --yacc -d -p tsconfig
AM_CPPFLAGS += \
- -I$(abs_top_srcdir)/lib
+ -I$(abs_top_srcdir)/lib \
+ $(TS_INCLUDES)
BUILT_SOURCES = \
TsConfigGrammar.hpp
diff --git a/lib/wccp/Makefile.am b/lib/wccp/Makefile.am
index 716029e..e8f6609 100644
--- a/lib/wccp/Makefile.am
+++ b/lib/wccp/Makefile.am
@@ -21,7 +21,8 @@ include $(top_srcdir)/build/tidy.mk
AM_CPPFLAGS += \
-I$(abs_top_srcdir)/lib \
- -I$(abs_top_srcdir)/proxy
+ -I$(abs_top_srcdir)/proxy \
+ $(TS_INCLUDES)
#WCCP_DEFS = @WCCP_DEFS@
#DEFS += $(WCCP_DEFS)
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index ee3ba71..379561d 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -33,7 +33,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/proxy/http \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/lib/records \
- -I$(abs_top_srcdir)/lib
+ -I$(abs_top_srcdir)/lib \
+ $(TS_INCLUDES)
libmgmt_c_la_SOURCES = \
RecordsConfig.cc \
diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am
index e9c8357..ecf2639 100644
--- a/mgmt/api/Makefile.am
+++ b/mgmt/api/Makefile.am
@@ -28,6 +28,7 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/mgmt/utils \
-I$(abs_top_srcdir)/mgmt/api/include \
-I$(abs_top_srcdir)/lib \
+ $(TS_INCLUDES) \
$(LIBUNWIND_CFLAGS)
noinst_LTLIBRARIES = libmgmtapilocal.la libmgmtapi.la
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index ba4a24f..ed29c18 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -26,6 +26,7 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/lib/records \
-I$(abs_top_srcdir)/lib \
+ $(TS_INCLUDES) \
@OPENSSL_INCLUDES@
# header files used by other libraries
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 5e4892e..7e84586 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -42,6 +42,7 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/utils \
-I$(abs_top_srcdir)/lib \
+ $(TS_INCLUDES) \
@OPENSSL_INCLUDES@
# NOTE: it is safe to use AM_LDFLAGS here because we are only building executables. If we start
diff --git a/proxy/congest/Makefile.am b/proxy/congest/Makefile.am
index 111e8b1..9b49948 100644
--- a/proxy/congest/Makefile.am
+++ b/proxy/congest/Makefile.am
@@ -25,7 +25,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/utils \
-I$(abs_top_srcdir)/proxy/shared \
- -I$(abs_top_srcdir)/proxy/hdrs
+ -I$(abs_top_srcdir)/proxy/hdrs \
+ $(TS_INCLUDES)
noinst_LIBRARIES = libCongestionControl.a
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
index c2503f3..5ec2bd6 100644
--- a/proxy/hdrs/Makefile.am
+++ b/proxy/hdrs/Makefile.am
@@ -21,7 +21,8 @@ include $(top_srcdir)/build/tidy.mk
AM_CPPFLAGS += \
$(iocore_include_dirs) \
-I$(abs_top_srcdir)/lib \
- -I$(abs_top_srcdir)/lib/records
+ -I$(abs_top_srcdir)/lib/records \
+ $(TS_INCLUDES)
noinst_LIBRARIES = libhdrs.a
EXTRA_PROGRAMS = load_http_hdr
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index cf2adfb..0f2956e 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -31,7 +31,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/proxy/shared \
-I$(abs_top_srcdir)/proxy/http/remap \
-I$(abs_top_srcdir)/proxy/logging \
- -I$(abs_top_srcdir)/proxy/http2
+ -I$(abs_top_srcdir)/proxy/http2 \
+ $(TS_INCLUDES)
noinst_HEADERS = HttpProxyServerMain.h
noinst_LIBRARIES = libhttp.a
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index e93220c..0b23e78 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -27,7 +27,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/mgmt/utils \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/proxy/shared \
- -I$(abs_top_srcdir)/proxy/http
+ -I$(abs_top_srcdir)/proxy/http \
+ $(TS_INCLUDES)
noinst_LIBRARIES = libhttp_remap.a
diff --git a/proxy/http2/Makefile.am b/proxy/http2/Makefile.am
index 848b71c..695b426 100644
--- a/proxy/http2/Makefile.am
+++ b/proxy/http2/Makefile.am
@@ -28,7 +28,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/proxy/http \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/proxy/shared \
- -I$(abs_top_srcdir)/proxy/http/remap
+ -I$(abs_top_srcdir)/proxy/http/remap \
+ $(TS_INCLUDES)
noinst_LIBRARIES = libhttp2.a
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index 883a2b2..d647203 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -28,7 +28,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/proxy/shared \
-I$(abs_top_srcdir)/mgmt \
- -I$(abs_top_srcdir)/mgmt/utils
+ -I$(abs_top_srcdir)/mgmt/utils \
+ $(TS_INCLUDES)
if BUILD_LUAJIT
AM_CPPFLAGS += \
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
index 97cfa4a..f98617e 100644
--- a/proxy/shared/Makefile.am
+++ b/proxy/shared/Makefile.am
@@ -35,9 +35,8 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/proxy/http \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/proxy/logging \
- -I$(abs_top_srcdir)/lib
-
-
+ -I$(abs_top_srcdir)/lib \
+ $(TS_INCLUDES)
libdiagsconfig_a_SOURCES = \
DiagsConfig.cc
diff --git a/rc/Makefile.am b/rc/Makefile.am
index 647ad33..98d0814 100644
--- a/rc/Makefile.am
+++ b/rc/Makefile.am
@@ -16,13 +16,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS += \
- -I$(abs_top_srcdir)/lib/records \
- -I$(abs_top_srcdir)/proxy \
- -I$(abs_top_srcdir)/mgmt \
- -I$(abs_top_srcdir)/mgmt/utils \
- -I$(abs_top_srcdir)/proxy/cache \
- -I$(abs_top_srcdir)/proxy/logging
-
dist_bin_SCRIPTS = \
trafficserver
diff --git a/tests/unit_tests/Makefile.am b/tests/unit_tests/Makefile.am
index e375361..1300209 100644
--- a/tests/unit_tests/Makefile.am
+++ b/tests/unit_tests/Makefile.am
@@ -16,7 +16,8 @@
# limitations under the License.
AM_CPPFLAGS += \
- -I$(abs_top_srcdir)
+ -I$(abs_top_srcdir) \
+ $(TS_INCLUDES)
bin_PROGRAMS = unit_tests
diff --git a/tools/Makefile.am b/tools/Makefile.am
index af4f15d..08ce762 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -22,9 +22,11 @@ bin_SCRIPTS = tsxs tspush
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = trafficserver.pc
-AM_CPPFLAGS += $(iocore_include_dirs) \
+AM_CPPFLAGS += \
+ $(iocore_include_dirs) \
-I$(abs_top_srcdir)/lib \
- -I$(abs_top_srcdir)/lib/wccp
+ -I$(abs_top_srcdir)/lib/wccp \
+ $(TS_INCLUDES)
if BUILD_TEST_TOOLS
bin_PROGRAMS = jtest/jtest
--
To stop receiving notification emails like this one, please contact
jpeach@apache.org.