trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject [trafficserver] branch 8.0.x updated: Follow up for #3724 - fix out of tree builds.
Date Thu, 13 Sep 2018 23:40:49 GMT
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.0.x by this push:
     new 667ef7c  Follow up for #3724 - fix out of tree builds.
667ef7c is described below

commit 667ef7c30f436dac397ab684762dbcb572f7e332
Author: Alan M. Carroll <amc@apache.org>
AuthorDate: Thu Sep 13 18:06:23 2018 -0500

    Follow up for #3724 - fix out of tree builds.
    
    (cherry picked from commit 10269696bfbbc451be6f6585cde47efe2696a83f)
---
 CMakeLists.txt                             | 7 +++----
 build/plugins.mk                           | 3 ++-
 configure.ac                               | 2 +-
 iocore/aio/Makefile.am                     | 2 +-
 iocore/cache/Makefile.am                   | 2 +-
 iocore/dns/Makefile.am                     | 2 +-
 iocore/eventsystem/Makefile.am             | 2 +-
 iocore/hostdb/Makefile.am                  | 2 +-
 iocore/net/Makefile.am                     | 2 +-
 iocore/utils/Makefile.am                   | 2 +-
 lib/records/Makefile.am                    | 1 +
 lib/tsconfig/Makefile.am                   | 1 +
 mgmt/Makefile.am                           | 4 ++--
 mgmt/api/Makefile.am                       | 4 ++--
 mgmt/utils/Makefile.am                     | 2 +-
 plugins/experimental/memcache/Makefile.inc | 3 +--
 proxy/Makefile.am                          | 2 +-
 proxy/hdrs/Makefile.am                     | 2 +-
 proxy/http/Makefile.am                     | 2 +-
 proxy/http/remap/Makefile.am               | 2 +-
 proxy/http2/Makefile.am                    | 2 +-
 proxy/logging/Makefile.am                  | 2 +-
 proxy/shared/Makefile.am                   | 5 ++---
 src/traffic_cache_tool/Makefile.inc        | 1 +
 src/traffic_crashlog/Makefile.inc          | 2 +-
 src/traffic_ctl/Makefile.inc               | 2 +-
 src/traffic_layout/Makefile.inc            | 2 +-
 src/traffic_logcat/Makefile.inc            | 2 +-
 src/traffic_logstats/Makefile.inc          | 2 +-
 src/traffic_manager/Makefile.inc           | 4 ++--
 src/traffic_server/Makefile.inc            | 2 +-
 src/traffic_top/Makefile.inc               | 2 +-
 src/traffic_wccp/Makefile.inc              | 3 +--
 src/traffic_wccp/wccp_client.cc            | 4 ++--
 src/tscore/Makefile.am                     | 3 +--
 src/wccp/Makefile.am                       | 1 +
 36 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe88519..b3a9328 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,13 +33,14 @@ project(ats)
 set(CMAKE_CXX_STANDARD 11)
 
 include_directories(lib
+        include
         proxy
         proxy/hdrs
         proxy/http
         proxy/http/remap
         proxy/shared
         lib/records
-        lib/wccp
+        include/wccp
         lib/yamlcpp/include
         iocore/eventsystem
         iocore/net
@@ -915,7 +916,6 @@ add_executable(ats
 
 add_library(libtscore SHARED
         include/tscore/Allocator.h
-        include/tscore/apidefs.h
         src/tscore/Arena.cc
         include/tscore/Arena.h
         src/tscore/BaseLogFile.cc
@@ -958,7 +958,6 @@ add_library(libtscore SHARED
         include/tscore/I_Version.h
         include/tscore/ink_aiocb.h
         include/tscore/ink_align.h
-        include/tscore/ink_apidefs.h
         src/tscore/ink_args.cc
         include/tscore/ink_args.h
         src/tscore/ink_assert.cc
@@ -1087,7 +1086,7 @@ add_library(libtscore SHARED
         src/tscore/tests.cc
         src/tscore/TextBuffer.cc
         include/tscore/TextBuffer.h
-        include/tscore/TextView.h
+        include/tscpp/util/TextView.h
         src/tscore/Tokenizer.cc
         include/tscore/Tokenizer.h
         include/tscore/Trie.h
diff --git a/build/plugins.mk b/build/plugins.mk
index 5dcf212..86d0a66 100644
--- a/build/plugins.mk
+++ b/build/plugins.mk
@@ -29,7 +29,8 @@ TS_PLUGIN_CPPFLAGS = \
   -I$(abs_top_srcdir)/proxy/api \
   -I$(abs_top_srcdir)/include/cppapi/include \
   -I$(abs_top_builddir)/lib/cppapi/include \
-  -I$(abs_top_srcdir)/include
+  -I$(abs_top_srcdir)/include \
+  -I$(abs_top_srcdir)/lib
 
 # Provide a default AM_CPPFLAGS. Automake handles this correctly, but libtool
 # throws an error if we try to do the same with AM_LDFLAGS. Hence, we provide
diff --git a/configure.ac b/configure.ac
index 44cd667..7cce53e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AM_MAINTAINER_MODE([enable])
 # Enable a recursive "tidy" rule for clang-tidy.
 m4_ifdef([AM_EXTRA_RECURSIVE_TARGETS], [AM_EXTRA_RECURSIVE_TARGETS([clang-tidy])])
 
-AC_CONFIG_HEADERS([lib/ink_autoconf.h])
+AC_CONFIG_HEADERS([include/ink_autoconf.h])
 
 # Configure with --disable-silent-rules to get verbose output. For more info, see
 # http://www.gnu.org/software/automake/manual/html_node/Automake-silent_002drules-Option.html
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index 3d2f9f3..8815fda 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -19,7 +19,7 @@
 AM_CPPFLAGS += \
 	-I$(abs_top_srcdir)/iocore/eventsystem \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	$(TS_INCLUDES)
 
 TESTS = test_AIO.sample
diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
index 66345cc..ed05579 100644
--- a/iocore/cache/Makefile.am
+++ b/iocore/cache/Makefile.am
@@ -19,7 +19,7 @@
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/proxy/hdrs \
 	-I$(abs_top_srcdir)/proxy/http \
diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am
index 2713af7..a7287d2 100644
--- a/iocore/dns/Makefile.am
+++ b/iocore/dns/Makefile.am
@@ -19,7 +19,7 @@
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/proxy/http \
 	-I$(abs_top_srcdir)/proxy/hdrs \
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index 17d0ea9..4a76772 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -18,7 +18,7 @@
 
 AM_CPPFLAGS += \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	$(TS_INCLUDES)
 
 TESTS = $(check_PROGRAMS)
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index 3b0e910..1ae57e3 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -19,7 +19,7 @@
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/proxy/hdrs \
 	-I$(abs_top_srcdir)/proxy/http \
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
index 82d03ef..bfa0493 100644
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@ -19,7 +19,7 @@
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/proxy/hdrs \
 	-I$(abs_top_srcdir)/proxy/shared \
diff --git a/iocore/utils/Makefile.am b/iocore/utils/Makefile.am
index 471d380..fa2d39f 100644
--- a/iocore/utils/Makefile.am
+++ b/iocore/utils/Makefile.am
@@ -18,7 +18,7 @@
 
 AM_CPPFLAGS += \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/iocore/eventsystem \
 	$(TS_INCLUDES)
 
diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am
index fb99be2..195d908 100644
--- a/lib/records/Makefile.am
+++ b/lib/records/Makefile.am
@@ -25,6 +25,7 @@ AM_CPPFLAGS += \
 	-I$(abs_top_srcdir)/mgmt/api/include \
 	-I$(abs_top_srcdir)/mgmt/utils \
 	-I$(abs_top_srcdir)/include \
+	-I$(abs_top_srcdir)/lib \
 	$(TS_INCLUDES)
 
 noinst_LIBRARIES = librecords_lm.a librecords_p.a
diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am
index 4e32acf..880840c 100644
--- a/lib/tsconfig/Makefile.am
+++ b/lib/tsconfig/Makefile.am
@@ -25,6 +25,7 @@ AM_YFLAGS = --yacc -d -p tsconfig
 
 AM_CPPFLAGS += \
 	-I$(abs_top_srcdir)/include \
+	-I$(abs_top_srcdir)/lib \
 	$(TS_INCLUDES)
 
 BUILT_SOURCES = \
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index d209f26..6ae7d27 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -27,13 +27,13 @@ noinst_LTLIBRARIES = libmgmt_c.la libmgmt_p.la libmgmt_lm.la
 
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/include \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/mgmt/api/include \
 	-I$(abs_top_srcdir)/mgmt/utils \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/proxy/http \
 	-I$(abs_top_srcdir)/proxy/hdrs \
-	-I$(abs_top_srcdir)/include/records \
-	-I$(abs_top_srcdir)/include \
 	$(TS_INCLUDES)
 
 libmgmt_c_la_SOURCES = \
diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am
index 8c9a6e3..ae9fa95 100644
--- a/mgmt/api/Makefile.am
+++ b/mgmt/api/Makefile.am
@@ -23,11 +23,11 @@ SUBDIRS = include
 
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/include \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/mgmt \
 	-I$(abs_top_srcdir)/mgmt/utils \
 	-I$(abs_top_srcdir)/mgmt/api/include \
-	-I$(abs_top_srcdir)/include \
 	$(TS_INCLUDES) \
 	$(LIBUNWIND_CFLAGS)
 
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index 7941be7..ac307f5 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -24,8 +24,8 @@ AM_CPPFLAGS += \
 	-I$(abs_top_srcdir)/mgmt/api/include \
 	-I$(abs_top_srcdir)/include/tsconfig \
 	-I$(abs_top_srcdir)/proxy \
-	-I$(abs_top_srcdir)/include/records \
 	-I$(abs_top_srcdir)/include \
+	-I$(abs_top_srcdir)/lib \
 	$(TS_INCLUDES) \
 	@OPENSSL_INCLUDES@
 
diff --git a/plugins/experimental/memcache/Makefile.inc b/plugins/experimental/memcache/Makefile.inc
index 42638db..0581525 100644
--- a/plugins/experimental/memcache/Makefile.inc
+++ b/plugins/experimental/memcache/Makefile.inc
@@ -23,8 +23,7 @@ experimental_memcache_tsmemcache_la_CPPFLAGS = \
   -I$(abs_top_srcdir)/iocore/net \
   -I$(abs_top_srcdir)/iocore/utils \
   -I$(abs_top_srcdir)/include \
-  -I$(abs_top_srcdir)/include/records \
-  -I$(abs_top_srcdir)/include/ts
+  -I$(abs_top_srcdir)/lib
 
 pkglib_LTLIBRARIES += experimental/memcache/tsmemcache.la
 
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 57c362d..0bd93d9 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -25,7 +25,7 @@ noinst_LIBRARIES = libproxy.a
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_srcdir)/http \
 	-I$(abs_srcdir)/logging \
 	-I$(abs_srcdir)/http/remap \
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
index d123553..42dad69 100644
--- a/proxy/hdrs/Makefile.am
+++ b/proxy/hdrs/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/build/tidy.mk
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	$(TS_INCLUDES)
 
 noinst_LIBRARIES = libhdrs.a
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index 1933932..5d2e544 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -24,7 +24,7 @@ AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/mgmt \
 	-I$(abs_top_srcdir)/mgmt/utils \
 	-I$(abs_top_srcdir)/proxy/hdrs \
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index 7d20677..ddee9dc 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/build/tidy.mk
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/mgmt \
 	-I$(abs_top_srcdir)/mgmt/utils \
diff --git a/proxy/http2/Makefile.am b/proxy/http2/Makefile.am
index fe86f78..7bbfda1 100644
--- a/proxy/http2/Makefile.am
+++ b/proxy/http2/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/build/tidy.mk
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/mgmt \
 	-I$(abs_top_srcdir)/mgmt/utils \
 	-I$(abs_top_srcdir)/proxy \
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index 4c341e0..cac0eb4 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/build/tidy.mk
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/proxy/http \
 	-I$(abs_top_srcdir)/proxy/http/remap \
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
index 1880725..1d54d40 100644
--- a/proxy/shared/Makefile.am
+++ b/proxy/shared/Makefile.am
@@ -25,17 +25,16 @@ noinst_LIBRARIES = \
 
 AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/include \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/mgmt \
 	-I$(abs_top_srcdir)/mgmt/api \
 	-I$(abs_top_srcdir)/mgmt/api/include \
 	-I$(abs_top_srcdir)/mgmt/utils \
-	-I$(abs_top_srcdir) \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/proxy/http \
 	-I$(abs_top_srcdir)/proxy/hdrs \
 	-I$(abs_top_srcdir)/proxy/logging \
-	-I$(abs_top_srcdir)/include \
 	$(TS_INCLUDES)
 
 libdiagsconfig_a_SOURCES = \
diff --git a/src/traffic_cache_tool/Makefile.inc b/src/traffic_cache_tool/Makefile.inc
index 9082cf8..8b3dfb4 100644
--- a/src/traffic_cache_tool/Makefile.inc
+++ b/src/traffic_cache_tool/Makefile.inc
@@ -22,6 +22,7 @@ bin_PROGRAMS += traffic_cache_tool/traffic_cache_tool
 traffic_cache_tool_traffic_cache_tool_CPPFLAGS = \
     $(AM_CPPFLAGS) \
     -I $(abs_top_srcdir)/include \
+    -I $(abs_top_srcdir)/lib \
     -D__STDC_FORMAT_MACROS
 
 traffic_cache_tool_traffic_cache_tool_SOURCES = \
diff --git a/src/traffic_crashlog/Makefile.inc b/src/traffic_crashlog/Makefile.inc
index 7880a2b..b7a408b 100644
--- a/src/traffic_crashlog/Makefile.inc
+++ b/src/traffic_crashlog/Makefile.inc
@@ -21,7 +21,7 @@ traffic_crashlog_traffic_crashlog_CPPFLAGS = \
     $(AM_CPPFLAGS) \
     $(iocore_include_dirs) \
     -I$(abs_top_srcdir)/include \
-    -I$(abs_top_srcdir)/include/records \
+    -I$(abs_top_srcdir)/lib \
     -I$(abs_top_srcdir)/mgmt \
     -I$(abs_top_srcdir)/mgmt/utils \
     -I$(abs_top_srcdir)/mgmt/api/include \
diff --git a/src/traffic_ctl/Makefile.inc b/src/traffic_ctl/Makefile.inc
index 94ab54d..db724d9 100644
--- a/src/traffic_ctl/Makefile.inc
+++ b/src/traffic_ctl/Makefile.inc
@@ -23,7 +23,7 @@ traffic_ctl_traffic_ctl_CPPFLAGS = \
     $(AM_CPPFLAGS) \
     $(iocore_include_dirs) \
     -I$(abs_top_srcdir)/include \
-    -I$(abs_top_srcdir)/include/records \
+    -I$(abs_top_srcdir)/lib \
     -I$(abs_top_srcdir)/mgmt \
     -I$(abs_top_srcdir)/mgmt/api/include \
     $(TS_INCLUDES)
diff --git a/src/traffic_layout/Makefile.inc b/src/traffic_layout/Makefile.inc
index 71e47fa..77a93a5 100644
--- a/src/traffic_layout/Makefile.inc
+++ b/src/traffic_layout/Makefile.inc
@@ -21,7 +21,7 @@ traffic_layout_traffic_layout_CPPFLAGS = \
     $(AM_CPPFLAGS) \
     $(iocore_include_dirs) \
     -I$(abs_top_srcdir)/include \
-    -I$(abs_top_srcdir)/include/records \
+    -I$(abs_top_srcdir)/lib \
     -I$(abs_top_srcdir)/mgmt \
     -I$(abs_top_srcdir)/mgmt/utils \
     @YAMLCPP_INCLUDES@ \
diff --git a/src/traffic_logcat/Makefile.inc b/src/traffic_logcat/Makefile.inc
index c58a047..4c96242 100644
--- a/src/traffic_logcat/Makefile.inc
+++ b/src/traffic_logcat/Makefile.inc
@@ -23,7 +23,7 @@ traffic_logcat_traffic_logcat_CPPFLAGS = \
     $(AM_CPPFLAGS) \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/proxy/logging \
 	-I$(abs_top_srcdir)/proxy/shared \
diff --git a/src/traffic_logstats/Makefile.inc b/src/traffic_logstats/Makefile.inc
index d41219e..8926084 100644
--- a/src/traffic_logstats/Makefile.inc
+++ b/src/traffic_logstats/Makefile.inc
@@ -23,7 +23,7 @@ traffic_logstats_traffic_logstats_CPPFLAGS = \
     $(AM_CPPFLAGS) \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/proxy/logging \
 	-I$(abs_top_srcdir)/proxy/shared \
diff --git a/src/traffic_manager/Makefile.inc b/src/traffic_manager/Makefile.inc
index c99bec3..de2d625 100644
--- a/src/traffic_manager/Makefile.inc
+++ b/src/traffic_manager/Makefile.inc
@@ -20,14 +20,14 @@ bin_PROGRAMS += traffic_manager/traffic_manager
 traffic_manager_traffic_manager_CPPFLAGS = \
     $(AM_CPPFLAGS) \
 	$(iocore_include_dirs) \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/include \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy/hdrs \
 	-I$(abs_top_srcdir)/proxy/shared \
 	-I$(abs_top_srcdir)/mgmt \
 	-I$(abs_top_srcdir)/mgmt/api \
 	-I$(abs_top_srcdir)/mgmt/api/include \
 	-I$(abs_top_srcdir)/mgmt/utils \
-	-I$(abs_top_srcdir)/include \
 	$(TS_INCLUDES)
 
 traffic_manager_traffic_manager_LDFLAGS = \
diff --git a/src/traffic_server/Makefile.inc b/src/traffic_server/Makefile.inc
index eae9362..98966c3 100644
--- a/src/traffic_server/Makefile.inc
+++ b/src/traffic_server/Makefile.inc
@@ -23,7 +23,7 @@ traffic_server_traffic_server_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy \
 	-I$(abs_top_srcdir)/proxy/http \
 	-I$(abs_top_srcdir)/proxy/http2 \
diff --git a/src/traffic_top/Makefile.inc b/src/traffic_top/Makefile.inc
index 67636be..e81ab11 100644
--- a/src/traffic_top/Makefile.inc
+++ b/src/traffic_top/Makefile.inc
@@ -24,7 +24,7 @@ traffic_top_traffic_top_CPPFLAGS = \
     $(AM_CPPFLAGS) \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
-	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/mgmt \
 	-I$(abs_top_srcdir)/mgmt/api/include \
 	$(TS_INCLUDES) \
diff --git a/src/traffic_wccp/Makefile.inc b/src/traffic_wccp/Makefile.inc
index 5446e24..daa92f4 100644
--- a/src/traffic_wccp/Makefile.inc
+++ b/src/traffic_wccp/Makefile.inc
@@ -23,8 +23,7 @@ traffic_wccp_traffic_wccp_CPPFLAGS = \
     $(AM_CPPFLAGS) \
     $(iocore_include_dirs) \
     -I$(abs_top_srcdir)/include \
-    -I$(abs_top_srcdir)/include/records \
-    -I$(abs_top_srcdir)/include/wccp \
+    -I$(abs_top_srcdir)/lib \
     $(TS_INCLUDES) \
     @OPENSSL_INCLUDES@
 
diff --git a/src/traffic_wccp/wccp_client.cc b/src/traffic_wccp/wccp_client.cc
index 03a9d56..aca1bc9 100644
--- a/src/traffic_wccp/wccp_client.cc
+++ b/src/traffic_wccp/wccp_client.cc
@@ -37,8 +37,8 @@
 #include <poll.h>
 
 #include "tscore/ink_memory.h"
-#include "Wccp.h"
-#include "wccp/WccpUtil.h"
+#include "wccp/Wccp.h"
+#include "../wccp/WccpUtil.h"
 #include "tsconfig/TsValue.h"
 #include "tscore/ink_lockfile.h"
 
diff --git a/src/tscore/Makefile.am b/src/tscore/Makefile.am
index 25b7ecd..e689d86 100644
--- a/src/tscore/Makefile.am
+++ b/src/tscore/Makefile.am
@@ -18,8 +18,6 @@
 
 include $(top_srcdir)/build/tidy.mk
 
-library_includedir=$(includedir)/ts
-
 noinst_PROGRAMS = mkdfa CompileParseRules
 check_PROGRAMS = test_libtscore test_arena test_atomic test_freelist test_geometry test_List
test_Map test_Vec test_X509HostnameValidator test_tscore
 
@@ -33,6 +31,7 @@ AM_CPPFLAGS += \
 	$(iocore_include_dirs) \
 	-I$(abs_top_srcdir)/include \
 	-I$(abs_top_srcdir)/include/records \
+	-I$(abs_top_srcdir)/lib \
 	$(TS_INCLUDES) \
 	@YAMLCPP_INCLUDES@
 
diff --git a/src/wccp/Makefile.am b/src/wccp/Makefile.am
index a0b719f..982f9f9 100644
--- a/src/wccp/Makefile.am
+++ b/src/wccp/Makefile.am
@@ -21,6 +21,7 @@ include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
 	-I$(abs_top_srcdir)/include \
+	-I$(abs_top_srcdir)/lib \
 	-I$(abs_top_srcdir)/proxy \
 	$(TS_INCLUDES)
 


Mime
View raw message