You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/07/10 06:47:38 UTC
[3/4] trafficserver git commit: TS-3739 TS-3427 Fix out-of-tree
builds for core, and for cppapi
TS-3739 TS-3427 Fix out-of-tree builds for core, and for cppapi
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/36e1dd0a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/36e1dd0a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/36e1dd0a
Branch: refs/heads/master
Commit: 36e1dd0a65c7a3677a2a991c016689d2e2eca8b4
Parents: 57973fb
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jul 9 22:09:59 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jul 9 22:09:59 2015 -0600
----------------------------------------------------------------------
cmd/traffic_cop/Makefile.am | 1 +
cmd/traffic_crashlog/Makefile.am | 1 +
cmd/traffic_ctl/Makefile.am | 1 +
cmd/traffic_layout/Makefile.am | 1 +
cmd/traffic_line/Makefile.am | 1 +
cmd/traffic_manager/Makefile.am | 1 +
cmd/traffic_via/Makefile.am | 1 +
iocore/aio/Makefile.am | 3 +-
iocore/cache/Makefile.am | 1 +
iocore/cluster/Makefile.am | 1 +
iocore/dns/Makefile.am | 1 +
iocore/eventsystem/Makefile.am | 3 +-
iocore/hostdb/Makefile.am | 1 +
iocore/net/Makefile.am | 1 +
iocore/utils/Makefile.am | 1 +
.../examples/async_http_fetch/Makefile.am | 2 +-
.../async_http_fetch_streaming/Makefile.am | 2 +-
lib/atscppapi/examples/async_timer/Makefile.am | 2 +-
lib/atscppapi/examples/boom/Makefile.am | 2 +-
.../examples/clientredirect/Makefile.am | 2 +-
.../examples/clientrequest/Makefile.am | 2 +-
.../examples/customresponse/Makefile.am | 2 +-
lib/atscppapi/examples/globalhook/Makefile.am | 2 +-
.../examples/gzip_transformation/Makefile.am | 2 +-
lib/atscppapi/examples/helloworld/Makefile.am | 2 +-
lib/atscppapi/examples/intercept/Makefile.am | 2 +-
.../internal_transaction_handling/Makefile.am | 2 +-
.../examples/logger_example/Makefile.am | 2 +-
.../multiple_transaction_hooks/Makefile.am | 2 +-
.../null_transformation_plugin/Makefile.am | 2 +-
lib/atscppapi/examples/post_buffer/Makefile.am | 2 +-
lib/atscppapi/examples/remap_plugin/Makefile.am | 2 +-
.../examples/serverresponse/Makefile.am | 2 +-
lib/atscppapi/examples/stat_example/Makefile.am | 2 +-
.../examples/timeout_example/Makefile.am | 2 +-
.../examples/transactionhook/Makefile.am | 2 +-
lib/atscppapi/src/Makefile.am | 4 +-
lib/records/Makefile.am | 3 +-
lib/ts/Allocator.h | 6 +-
lib/ts/Arena.h | 2 +-
lib/ts/Bitops.h | 3 +-
lib/ts/ConsistentHash.h | 2 +-
lib/ts/Diags.h | 8 +-
lib/ts/EventNotify.h | 2 +-
lib/ts/HashFNV.h | 2 +-
lib/ts/HashMD5.h | 2 +-
lib/ts/HashSip.h | 2 +-
lib/ts/INK_MD5.h | 6 +-
lib/ts/IpMap.h | 12 +-
lib/ts/List.h | 6 +-
lib/ts/MMH.h | 6 +-
lib/ts/Map.h | 7 +-
lib/ts/MimeTable.h | 4 +-
lib/ts/ParseRules.h | 6 +-
lib/ts/Ptr.h | 2 +-
lib/ts/RawHashTable.h | 5 +-
lib/ts/Regex.h | 2 +-
lib/ts/TextBuffer.h | 4 +-
lib/ts/Tokenizer.h | 2 +-
lib/ts/Trie.h | 2 +-
lib/ts/Vec.h | 2 +-
lib/ts/defalloc.h | 2 +-
lib/ts/ink_aiocb.h | 2 +-
lib/ts/ink_align.h | 2 +-
lib/ts/ink_args.h | 4 +-
lib/ts/ink_assert.h | 4 +-
lib/ts/ink_atomic.h | 6 +-
lib/ts/ink_auth_api.h | 2 +-
lib/ts/ink_cap.h | 2 +-
lib/ts/ink_code.h | 4 +-
lib/ts/ink_defs.h | 2 +-
lib/ts/ink_error.h | 4 +-
lib/ts/ink_file.h | 2 +-
lib/ts/ink_hash_table.h | 2 +-
lib/ts/ink_hrtime.h | 4 +-
lib/ts/ink_inet.h | 6 +-
lib/ts/ink_llqueue.h | 4 +-
lib/ts/ink_lockfile.h | 4 +-
lib/ts/ink_memory.h | 2 +-
lib/ts/ink_mutex.h | 2 +-
lib/ts/ink_platform.h | 2 +-
lib/ts/ink_queue.h | 6 +-
lib/ts/ink_rand.h | 4 +-
lib/ts/ink_resolver.h | 5 +-
lib/ts/ink_resource.h | 2 +-
lib/ts/ink_rwlock.h | 4 +-
lib/ts/ink_sock.h | 6 +-
lib/ts/ink_sprintf.h | 4 +-
lib/ts/ink_string.h | 8 +-
lib/ts/ink_thread.h | 8 +-
lib/ts/ink_time.h | 6 +-
lib/ts/libts.h | 128 +++++++++----------
lib/ts/test_List.cc | 2 +-
lib/ts/test_Regex.cc | 6 +-
lib/ts/test_atomic.cc | 7 +-
lib/ts/test_geometry.cc | 4 +-
lib/tsconfig/Makefile.am | 5 +-
mgmt/Makefile.am | 1 +
mgmt/api/Makefile.am | 1 +
mgmt/cluster/Makefile.am | 1 +
mgmt/utils/Makefile.am | 1 +
.../ssl_cert_loader/ssl-cert-loader.cc | 7 +-
proxy/Makefile.am | 1 +
proxy/congest/Makefile.am | 1 +
proxy/hdrs/Makefile.am | 3 +-
proxy/http/Makefile.am | 1 +
proxy/http/remap/Makefile.am | 1 +
proxy/http2/Makefile.am | 1 +
proxy/logging/Makefile.am | 1 +
proxy/shared/Makefile.am | 1 +
proxy/spdy/Makefile.am | 1 +
111 files changed, 244 insertions(+), 208 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/cmd/traffic_cop/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/Makefile.am b/cmd/traffic_cop/Makefile.am
index 46f7a31..74c4f6f 100644
--- a/cmd/traffic_cop/Makefile.am
+++ b/cmd/traffic_cop/Makefile.am
@@ -21,6 +21,7 @@ AM_CPPFLAGS = $(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/api/include
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/cmd/traffic_crashlog/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_crashlog/Makefile.am b/cmd/traffic_crashlog/Makefile.am
index 558b801..131e954 100644
--- a/cmd/traffic_crashlog/Makefile.am
+++ b/cmd/traffic_crashlog/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/cmd/traffic_ctl/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_ctl/Makefile.am b/cmd/traffic_ctl/Makefile.am
index d83fd19..cf471cc 100644
--- a/cmd/traffic_ctl/Makefile.am
+++ b/cmd/traffic_ctl/Makefile.am
@@ -21,6 +21,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/mgmt/api/include
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/cmd/traffic_layout/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_layout/Makefile.am b/cmd/traffic_layout/Makefile.am
index 571a42a..cc6361e 100644
--- a/cmd/traffic_layout/Makefile.am
+++ b/cmd/traffic_layout/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/cmd/traffic_line/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_line/Makefile.am b/cmd/traffic_line/Makefile.am
index 1181c28..0bf778d 100644
--- a/cmd/traffic_line/Makefile.am
+++ b/cmd/traffic_line/Makefile.am
@@ -21,6 +21,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt/api/include
AM_LDFLAGS = \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/cmd/traffic_manager/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am
index f29a337..7046eef 100644
--- a/cmd/traffic_manager/Makefile.am
+++ b/cmd/traffic_manager/Makefile.am
@@ -21,6 +21,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/shared \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/cmd/traffic_via/Makefile.am
----------------------------------------------------------------------
diff --git a/cmd/traffic_via/Makefile.am b/cmd/traffic_via/Makefile.am
index 7aeb2e8..a5bc285 100644
--- a/cmd/traffic_via/Makefile.am
+++ b/cmd/traffic_via/Makefile.am
@@ -21,6 +21,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt/api/include
AM_LDFLAGS = \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/iocore/aio/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index e4f4748..dce5abd 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -21,7 +21,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts
+ -I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts
TESTS = test_AIO.sample
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/iocore/cache/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
index 68e3090..97505ce 100644
--- a/iocore/cache/Makefile.am
+++ b/iocore/cache/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/iocore/cluster/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/cluster/Makefile.am b/iocore/cluster/Makefile.am
index 19bf843..1e1fb15 100644
--- a/iocore/cluster/Makefile.am
+++ b/iocore/cluster/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/api/ts \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/iocore/dns/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am
index fb1ec23..222d3cf 100644
--- a/iocore/dns/Makefile.am
+++ b/iocore/dns/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/hdrs \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/iocore/eventsystem/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index 955970f..5dc3b57 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -19,7 +19,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts
+ -I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts
TESTS = $(check_PROGRAMS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/iocore/hostdb/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index ef5d464..c475a81 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/http \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/iocore/net/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
index 77ded30..b8cfacd 100644
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/shared \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/iocore/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/utils/Makefile.am b/iocore/utils/Makefile.am
index da46aa0..fc95e06 100644
--- a/iocore/utils/Makefile.am
+++ b/iocore/utils/Makefile.am
@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/iocore/eventsystem
noinst_LIBRARIES = libinkutils.a
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/async_http_fetch/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/async_http_fetch/Makefile.am b/lib/atscppapi/examples/async_http_fetch/Makefile.am
index cd4973b..4201ce1 100644
--- a/lib/atscppapi/examples/async_http_fetch/Makefile.am
+++ b/lib/atscppapi/examples/async_http_fetch/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=AsyncHttpFetch.so
pkglib_LTLIBRARIES = AsyncHttpFetch.la
AsyncHttpFetch_la_SOURCES = AsyncHttpFetch.cc
-AsyncHttpFetch_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+AsyncHttpFetch_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/async_http_fetch_streaming/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/async_http_fetch_streaming/Makefile.am b/lib/atscppapi/examples/async_http_fetch_streaming/Makefile.am
index 5a3a049..ca63663 100644
--- a/lib/atscppapi/examples/async_http_fetch_streaming/Makefile.am
+++ b/lib/atscppapi/examples/async_http_fetch_streaming/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=AsyncHttpFetchStreaming.so
pkglib_LTLIBRARIES = AsyncHttpFetchStreaming.la
AsyncHttpFetchStreaming_la_SOURCES = AsyncHttpFetchStreaming.cc
-AsyncHttpFetchStreaming_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+AsyncHttpFetchStreaming_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/async_timer/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/async_timer/Makefile.am b/lib/atscppapi/examples/async_timer/Makefile.am
index 4df22f7..5a5ea45 100644
--- a/lib/atscppapi/examples/async_timer/Makefile.am
+++ b/lib/atscppapi/examples/async_timer/Makefile.am
@@ -21,4 +21,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=AsyncTimer.so
pkglib_LTLIBRARIES = AsyncTimer.la
AsyncTimer_la_SOURCES = AsyncTimer.cc
-AsyncTimer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+AsyncTimer_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/boom/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/boom/Makefile.am b/lib/atscppapi/examples/boom/Makefile.am
index f3a098e..ac56c7d 100644
--- a/lib/atscppapi/examples/boom/Makefile.am
+++ b/lib/atscppapi/examples/boom/Makefile.am
@@ -21,4 +21,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=boom.so
pkglib_LTLIBRARIES = boom.la
boom_la_SOURCES = boom.cc
-boom_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+boom_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/clientredirect/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/clientredirect/Makefile.am b/lib/atscppapi/examples/clientredirect/Makefile.am
index e1d3fd4..2e9e706 100644
--- a/lib/atscppapi/examples/clientredirect/Makefile.am
+++ b/lib/atscppapi/examples/clientredirect/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=ClientRedirect.so
pkglib_LTLIBRARIES = ClientRedirect.la
ClientRedirect_la_SOURCES = ClientRedirect.cc
-ClientRedirect_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+ClientRedirect_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/clientrequest/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/clientrequest/Makefile.am b/lib/atscppapi/examples/clientrequest/Makefile.am
index 1a31d4c..3375100 100644
--- a/lib/atscppapi/examples/clientrequest/Makefile.am
+++ b/lib/atscppapi/examples/clientrequest/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=ClientRequest.so
pkglib_LTLIBRARIES = ClientRequest.la
ClientRequest_la_SOURCES = ClientRequest.cc
-ClientRequest_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+ClientRequest_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/customresponse/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/customresponse/Makefile.am b/lib/atscppapi/examples/customresponse/Makefile.am
index 8666557..b68cf1b 100644
--- a/lib/atscppapi/examples/customresponse/Makefile.am
+++ b/lib/atscppapi/examples/customresponse/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=CustomResponse.so
pkglib_LTLIBRARIES = CustomResponse.la
CustomResponse_la_SOURCES = CustomResponse.cc
-CustomResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+CustomResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/globalhook/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/globalhook/Makefile.am b/lib/atscppapi/examples/globalhook/Makefile.am
index f3e30c7..aa61a42 100644
--- a/lib/atscppapi/examples/globalhook/Makefile.am
+++ b/lib/atscppapi/examples/globalhook/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=GlobalHookPlugin.so
pkglib_LTLIBRARIES = GlobalHookPlugin.la
GlobalHookPlugin_la_SOURCES = GlobalHookPlugin.cc
-GlobalHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+GlobalHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/gzip_transformation/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/gzip_transformation/Makefile.am b/lib/atscppapi/examples/gzip_transformation/Makefile.am
index 601aa81..2dfbd4c 100644
--- a/lib/atscppapi/examples/gzip_transformation/Makefile.am
+++ b/lib/atscppapi/examples/gzip_transformation/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=GzipTransformationPlugin.so
pkglib_LTLIBRARIES = GzipTransformationPlugin.la
GzipTransformationPlugin_la_SOURCES = GzipTransformationPlugin.cc
-GzipTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+GzipTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/helloworld/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/helloworld/Makefile.am b/lib/atscppapi/examples/helloworld/Makefile.am
index b284ad7..dbaa021 100644
--- a/lib/atscppapi/examples/helloworld/Makefile.am
+++ b/lib/atscppapi/examples/helloworld/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=HelloWorldPlugin.so
pkglib_LTLIBRARIES = HelloWorldPlugin.la
HelloWorldPlugin_la_SOURCES = HelloWorldPlugin.cc
-HelloWorldPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+HelloWorldPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/intercept/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/intercept/Makefile.am b/lib/atscppapi/examples/intercept/Makefile.am
index 6d3f8a2..1d7aa29 100644
--- a/lib/atscppapi/examples/intercept/Makefile.am
+++ b/lib/atscppapi/examples/intercept/Makefile.am
@@ -23,4 +23,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=intercept.so
pkglib_LTLIBRARIES = intercept.la
intercept_la_SOURCES = intercept.cc
-intercept_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+intercept_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/internal_transaction_handling/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/internal_transaction_handling/Makefile.am b/lib/atscppapi/examples/internal_transaction_handling/Makefile.am
index 9968dcb..0496add 100644
--- a/lib/atscppapi/examples/internal_transaction_handling/Makefile.am
+++ b/lib/atscppapi/examples/internal_transaction_handling/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=InternalTransactionHandling.so
pkglib_LTLIBRARIES = InternalTransactionHandling.la
InternalTransactionHandling_la_SOURCES = InternalTransactionHandling.cc
-InternalTransactionHandling_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+InternalTransactionHandling_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/logger_example/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/logger_example/Makefile.am b/lib/atscppapi/examples/logger_example/Makefile.am
index 01b7883..12e0566 100644
--- a/lib/atscppapi/examples/logger_example/Makefile.am
+++ b/lib/atscppapi/examples/logger_example/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=LoggerExample.so
pkglib_LTLIBRARIES = LoggerExample.la
LoggerExample_la_SOURCES = LoggerExample.cc
-LoggerExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+LoggerExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am b/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am
index 965bc55..659eb56 100644
--- a/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am
+++ b/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=MultipleTransactionHookPlugins.so
pkglib_LTLIBRARIES = MultipleTransactionHookPlugins.la
MultipleTransactionHookPlugins_la_SOURCES = MultipleTransactionHookPlugins.cc
-MultipleTransactionHookPlugins_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+MultipleTransactionHookPlugins_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/null_transformation_plugin/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/null_transformation_plugin/Makefile.am b/lib/atscppapi/examples/null_transformation_plugin/Makefile.am
index 7c83da7..4533516 100644
--- a/lib/atscppapi/examples/null_transformation_plugin/Makefile.am
+++ b/lib/atscppapi/examples/null_transformation_plugin/Makefile.am
@@ -23,4 +23,4 @@ target=NullTransformationPlugin.so
pkglib_LTLIBRARIES = NullTransformationPlugin.la
NullTransformationPlugin_la_SOURCES = NullTransformationPlugin.cc
-NullTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+NullTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/post_buffer/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/post_buffer/Makefile.am b/lib/atscppapi/examples/post_buffer/Makefile.am
index 46a6aee..c55e61f 100644
--- a/lib/atscppapi/examples/post_buffer/Makefile.am
+++ b/lib/atscppapi/examples/post_buffer/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=PostBuffer.so
pkglib_LTLIBRARIES = PostBuffer.la
PostBuffer_la_SOURCES = PostBuffer.cc
-PostBuffer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+PostBuffer_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/remap_plugin/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/remap_plugin/Makefile.am b/lib/atscppapi/examples/remap_plugin/Makefile.am
index 9c75db5..5543df1 100644
--- a/lib/atscppapi/examples/remap_plugin/Makefile.am
+++ b/lib/atscppapi/examples/remap_plugin/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=RemapPlugin.so
pkglib_LTLIBRARIES = RemapPlugin.la
RemapPlugin_la_SOURCES = RemapPlugin.cc
-RemapPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+RemapPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/serverresponse/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/serverresponse/Makefile.am b/lib/atscppapi/examples/serverresponse/Makefile.am
index 266e3e7..18ca52a 100644
--- a/lib/atscppapi/examples/serverresponse/Makefile.am
+++ b/lib/atscppapi/examples/serverresponse/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=ServerResponse.so
pkglib_LTLIBRARIES = ServerResponse.la
ServerResponse_la_SOURCES = ServerResponse.cc
-ServerResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+ServerResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/stat_example/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/stat_example/Makefile.am b/lib/atscppapi/examples/stat_example/Makefile.am
index c6fe78a..c382416 100644
--- a/lib/atscppapi/examples/stat_example/Makefile.am
+++ b/lib/atscppapi/examples/stat_example/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=StatExample.so
pkglib_LTLIBRARIES = StatExample.la
StatExample_la_SOURCES = StatExample.cc
-StatExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+StatExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/timeout_example/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/timeout_example/Makefile.am b/lib/atscppapi/examples/timeout_example/Makefile.am
index 2503930..a4e8bdb 100644
--- a/lib/atscppapi/examples/timeout_example/Makefile.am
+++ b/lib/atscppapi/examples/timeout_example/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=TimeoutExamplePlugin.so
pkglib_LTLIBRARIES = TimeoutExamplePlugin.la
TimeoutExamplePlugin_la_SOURCES = TimeoutExamplePlugin.cc
-TimeoutExamplePlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+TimeoutExamplePlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/examples/transactionhook/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/transactionhook/Makefile.am b/lib/atscppapi/examples/transactionhook/Makefile.am
index 90e0d10..013bb58 100644
--- a/lib/atscppapi/examples/transactionhook/Makefile.am
+++ b/lib/atscppapi/examples/transactionhook/Makefile.am
@@ -22,4 +22,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=TransactionHookPlugin.so
pkglib_LTLIBRARIES = TransactionHookPlugin.la
TransactionHookPlugin_la_SOURCES = TransactionHookPlugin.cc
-TransactionHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
+TransactionHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/atscppapi/src/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Makefile.am b/lib/atscppapi/src/Makefile.am
index 2f2aad5..64abfd7 100644
--- a/lib/atscppapi/src/Makefile.am
+++ b/lib/atscppapi/src/Makefile.am
@@ -20,7 +20,7 @@ TS_PLUGIN_CPPFLAGS = \
-I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib/ts
-AM_CXXFLAGS = -Iinclude $(TS_PLUGIN_CPPFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/$(subdir)/include $(TS_PLUGIN_CPPFLAGS)
# build the library
lib_LTLIBRARIES = libatscppapi.la
@@ -51,7 +51,7 @@ libatscppapi_la_SOURCES = GlobalPlugin.cc \
InterceptPlugin.cc
library_includedir=$(includedir)/atscppapi
-base_include_folder = include/atscppapi/
+base_include_folder = $(top_srcdir)/$(subdir)/include/atscppapi
library_include_HEADERS = $(base_include_folder)/GlobalPlugin.h \
$(base_include_folder)/Plugin.h \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/records/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am
index 3a0deb7..b612405 100644
--- a/lib/records/Makefile.am
+++ b/lib/records/Makefile.am
@@ -24,7 +24,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/lib \
-I$(top_builddir)/lib \
- -I$(top_srcdir)/lib/ts
+ -I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts
noinst_LIBRARIES = librecords_lm.a librecords_p.a librecords_cop.a
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/Allocator.h
----------------------------------------------------------------------
diff --git a/lib/ts/Allocator.h b/lib/ts/Allocator.h
index 6478cce..ca9d938 100644
--- a/lib/ts/Allocator.h
+++ b/lib/ts/Allocator.h
@@ -41,9 +41,9 @@
#define _Allocator_h_
#include <stdlib.h>
-#include "ink_queue.h"
-#include "ink_defs.h"
-#include "ink_resource.h"
+#include "ts/ink_queue.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_resource.h"
#define RND16(_x) (((_x) + 15) & ~15)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/Arena.h
----------------------------------------------------------------------
diff --git a/lib/ts/Arena.h b/lib/ts/Arena.h
index 0fda648..cedba9a 100644
--- a/lib/ts/Arena.h
+++ b/lib/ts/Arena.h
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <memory.h>
-#include "ink_assert.h"
+#include "ts/ink_assert.h"
struct ArenaBlock {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/Bitops.h
----------------------------------------------------------------------
diff --git a/lib/ts/Bitops.h b/lib/ts/Bitops.h
index 8bf7b59..078098e 100644
--- a/lib/ts/Bitops.h
+++ b/lib/ts/Bitops.h
@@ -23,7 +23,8 @@
#ifndef __BITOPS_H__
#define __BITOPS_H__
-#include "libts.h"
+
+#include <strings.h>
/**
Find First (bit) Set. Index starts at 1.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ConsistentHash.h
----------------------------------------------------------------------
diff --git a/lib/ts/ConsistentHash.h b/lib/ts/ConsistentHash.h
index 6406a6c6..1440b23 100644
--- a/lib/ts/ConsistentHash.h
+++ b/lib/ts/ConsistentHash.h
@@ -22,7 +22,7 @@
#ifndef __CONSISTENT_HASH_H__
#define __CONSISTENT_HASH_H__
-#include "Hash.h"
+#include "ts/Hash.h"
#include <stdint.h>
#include <iostream>
#include <map>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/Diags.h
----------------------------------------------------------------------
diff --git a/lib/ts/Diags.h b/lib/ts/Diags.h
index fe3248f..afe66bc 100644
--- a/lib/ts/Diags.h
+++ b/lib/ts/Diags.h
@@ -36,10 +36,10 @@
#define __DIAGS_H___
#include <stdarg.h>
-#include "ink_error.h"
-#include "ink_mutex.h"
-#include "Regex.h"
-#include "ink_apidefs.h"
+#include "ts/ink_error.h"
+#include "ts/ink_mutex.h"
+#include "ts/Regex.h"
+#include "ts/ink_apidefs.h"
#define DIAGS_MAGIC 0x12345678
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/EventNotify.h
----------------------------------------------------------------------
diff --git a/lib/ts/EventNotify.h b/lib/ts/EventNotify.h
index 7223e6d..ede0c14 100644
--- a/lib/ts/EventNotify.h
+++ b/lib/ts/EventNotify.h
@@ -31,7 +31,7 @@
#ifndef EVENT_NOTIFY_H
#define EVENT_NOTIFY_H
-#include "ink_thread.h"
+#include "ts/ink_thread.h"
class EventNotify
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/HashFNV.h
----------------------------------------------------------------------
diff --git a/lib/ts/HashFNV.h b/lib/ts/HashFNV.h
index 97a2bd5..d3123fe 100644
--- a/lib/ts/HashFNV.h
+++ b/lib/ts/HashFNV.h
@@ -28,7 +28,7 @@
#ifndef __HASH_FNV_H__
#define __HASH_FNV_H__
-#include "Hash.h"
+#include "ts/Hash.h"
#include <stdint.h>
struct ATSHash32FNV1a : ATSHash32 {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/HashMD5.h
----------------------------------------------------------------------
diff --git a/lib/ts/HashMD5.h b/lib/ts/HashMD5.h
index 0a4b566..8a353c5 100644
--- a/lib/ts/HashMD5.h
+++ b/lib/ts/HashMD5.h
@@ -22,7 +22,7 @@
#ifndef __HASH_MD5_H__
#define __HASH_MD5_H__
-#include "Hash.h"
+#include "ts/Hash.h"
#include <openssl/evp.h>
struct ATSHashMD5 : ATSHash {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/HashSip.h
----------------------------------------------------------------------
diff --git a/lib/ts/HashSip.h b/lib/ts/HashSip.h
index fe8a740..9bddce5 100644
--- a/lib/ts/HashSip.h
+++ b/lib/ts/HashSip.h
@@ -22,7 +22,7 @@
#ifndef __HASH_SIP_H__
#define __HASH_SIP_H__
-#include "Hash.h"
+#include "ts/Hash.h"
#include <stdint.h>
/*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/INK_MD5.h
----------------------------------------------------------------------
diff --git a/lib/ts/INK_MD5.h b/lib/ts/INK_MD5.h
index 218ad99..0ba8e81 100644
--- a/lib/ts/INK_MD5.h
+++ b/lib/ts/INK_MD5.h
@@ -24,9 +24,9 @@
#ifndef _INK_MD5_h_
#define _INK_MD5_h_
-#include "ink_code.h"
-#include "ink_defs.h"
-#include "CryptoHash.h"
+#include "ts/ink_code.h"
+#include "ts/ink_defs.h"
+#include "ts/CryptoHash.h"
class MD5Context : public CryptoContext
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/IpMap.h
----------------------------------------------------------------------
diff --git a/lib/ts/IpMap.h b/lib/ts/IpMap.h
index 5e15325..3cf7892 100644
--- a/lib/ts/IpMap.h
+++ b/lib/ts/IpMap.h
@@ -1,12 +1,12 @@
#if !defined(TS_IP_MAP_HEADER)
#define TS_IP_MAP_HEADER
-#include "ink_platform.h"
-#include "ink_defs.h"
-#include "RbTree.h"
-#include <ts/ink_inet.h>
-#include <ts/IntrusiveDList.h>
-#include <ts/ink_assert.h>
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/RbTree.h"
+#include "ts/ink_inet.h"
+#include "ts/IntrusiveDList.h"
+#include "ts/ink_assert.h"
/** @file
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/List.h
----------------------------------------------------------------------
diff --git a/lib/ts/List.h b/lib/ts/List.h
index e96212c..30da14a 100644
--- a/lib/ts/List.h
+++ b/lib/ts/List.h
@@ -56,9 +56,9 @@
#include <stdint.h>
-#include "ink_assert.h"
-#include "ink_queue.h"
-#include "defalloc.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_queue.h"
+#include "ts/defalloc.h"
//
// Link cell for singly-linked list of objects of type C.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/MMH.h
----------------------------------------------------------------------
diff --git a/lib/ts/MMH.h b/lib/ts/MMH.h
index a886bdf..5aa6334 100644
--- a/lib/ts/MMH.h
+++ b/lib/ts/MMH.h
@@ -24,9 +24,9 @@
#ifndef _MMH_h_
#define _MMH_h_
-#include "ink_code.h"
-#include "ink_defs.h"
-#include "CryptoHash.h"
+#include "ts/ink_code.h"
+#include "ts/ink_defs.h"
+#include "ts/CryptoHash.h"
struct MMH_CTX {
uint64_t state[4];
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/Map.h
----------------------------------------------------------------------
diff --git a/lib/ts/Map.h b/lib/ts/Map.h
index 1d37b36..43be257 100644
--- a/lib/ts/Map.h
+++ b/lib/ts/Map.h
@@ -26,9 +26,10 @@
#include <stdlib.h>
#include <string.h>
-#include "ink_assert.h"
-#include "List.h"
-#include "Vec.h"
+
+#include "ts/ink_assert.h"
+#include "ts/List.h"
+#include "ts/Vec.h"
#define MAP_INTEGRAL_SIZE (1 << (2))
//#define MAP_INITIAL_SHIFT ((2)+1)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/MimeTable.h
----------------------------------------------------------------------
diff --git a/lib/ts/MimeTable.h b/lib/ts/MimeTable.h
index f0cc6fa..e10b84b 100644
--- a/lib/ts/MimeTable.h
+++ b/lib/ts/MimeTable.h
@@ -25,8 +25,8 @@
#define _MimeTable_h_
#include <string.h>
-#include "ink_defs.h"
-#include "ink_string.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_string.h"
struct MimeTableEntry {
const char *name;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ParseRules.h
----------------------------------------------------------------------
diff --git a/lib/ts/ParseRules.h b/lib/ts/ParseRules.h
index ce5c676..4045b6d 100644
--- a/lib/ts/ParseRules.h
+++ b/lib/ts/ParseRules.h
@@ -26,9 +26,9 @@
#include <string.h>
-#include "ink_defs.h"
-#include "ink_apidefs.h"
-#include "ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_platform.h"
typedef unsigned int CTypeResult;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/Ptr.h
----------------------------------------------------------------------
diff --git a/lib/ts/Ptr.h b/lib/ts/Ptr.h
index 9c5fa0d..d193d31 100644
--- a/lib/ts/Ptr.h
+++ b/lib/ts/Ptr.h
@@ -35,7 +35,7 @@
#if !defined(_Ptr_h_)
#define _Ptr_h_
-#include "ink_atomic.h"
+#include "ts/ink_atomic.h"
////////////////////////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/RawHashTable.h
----------------------------------------------------------------------
diff --git a/lib/ts/RawHashTable.h b/lib/ts/RawHashTable.h
index 7d19701..17b8268 100644
--- a/lib/ts/RawHashTable.h
+++ b/lib/ts/RawHashTable.h
@@ -31,9 +31,8 @@
#ifndef _RawHashTable_h_
#define _RawHashTable_h_
-#include "libts.h"
-
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_hash_table.h"
//////////////////////////////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/Regex.h
----------------------------------------------------------------------
diff --git a/lib/ts/Regex.h b/lib/ts/Regex.h
index e16a01e..312ebfd 100644
--- a/lib/ts/Regex.h
+++ b/lib/ts/Regex.h
@@ -24,7 +24,7 @@
#ifndef __TS_REGEX_H__
#define __TS_REGEX_H__
-#include "ink_config.h"
+#include "ts/ink_config.h"
#ifdef HAVE_PCRE_PCRE_H
#include <pcre/pcre.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/TextBuffer.h
----------------------------------------------------------------------
diff --git a/lib/ts/TextBuffer.h b/lib/ts/TextBuffer.h
index b9bf0a7..d2ee112 100644
--- a/lib/ts/TextBuffer.h
+++ b/lib/ts/TextBuffer.h
@@ -32,8 +32,8 @@
*
****************************************************************************/
-#include "ink_platform.h"
-#include "ink_apidefs.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_apidefs.h"
class textBuffer
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/Tokenizer.h
----------------------------------------------------------------------
diff --git a/lib/ts/Tokenizer.h b/lib/ts/Tokenizer.h
index 8157458..295f341 100644
--- a/lib/ts/Tokenizer.h
+++ b/lib/ts/Tokenizer.h
@@ -102,7 +102,7 @@
*
*******************************************************************/
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
#define COPY_TOKS (1u << 0)
#define SHARE_TOKS (1u << 1)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/Trie.h
----------------------------------------------------------------------
diff --git a/lib/ts/Trie.h b/lib/ts/Trie.h
index 0a8fa79..84be064 100644
--- a/lib/ts/Trie.h
+++ b/lib/ts/Trie.h
@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <string.h>
-#include "List.h"
+#include "ts/List.h"
// Note that you should provide the class to use here, but we'll store
// pointers to such objects internally.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/Vec.h
----------------------------------------------------------------------
diff --git a/lib/ts/Vec.h b/lib/ts/Vec.h
index ea97e8b..d44e93a 100644
--- a/lib/ts/Vec.h
+++ b/lib/ts/Vec.h
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <sys/types.h>
#include "defalloc.h"
-#include "ink_assert.h"
+#include "ts/ink_assert.h"
// Simple Vector class, also supports open hashed sets
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/defalloc.h
----------------------------------------------------------------------
diff --git a/lib/ts/defalloc.h b/lib/ts/defalloc.h
index ce20678..6605134 100644
--- a/lib/ts/defalloc.h
+++ b/lib/ts/defalloc.h
@@ -23,7 +23,7 @@
#ifndef _defalloc_H_
#define _defalloc_H_
-#include "ink_memory.h"
+#include "ts/ink_memory.h"
class DefaultAlloc
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_aiocb.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_aiocb.h b/lib/ts/ink_aiocb.h
index 0689437..20d51ae 100644
--- a/lib/ts/ink_aiocb.h
+++ b/lib/ts/ink_aiocb.h
@@ -32,7 +32,7 @@
#ifndef _ink_aiocb_h_
#define _ink_aiocb_h_
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
/* TODO use native aiocb where possible */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_align.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_align.h b/lib/ts/ink_align.h
index 63f966a..591b311 100644
--- a/lib/ts/ink_align.h
+++ b/lib/ts/ink_align.h
@@ -25,7 +25,7 @@
#ifndef _ink_align_h_
#define _ink_align_h_
-#include "ink_time.h"
+#include "ts/ink_time.h"
union Alias32 {
uint8_t byte[4];
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_args.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_args.h b/lib/ts/ink_args.h
index f535fda..3db9642 100644
--- a/lib/ts/ink_args.h
+++ b/lib/ts/ink_args.h
@@ -28,8 +28,8 @@ Process arguments
#ifndef _INK_ARGS_H
#define _INK_ARGS_H
-#include "ink_defs.h"
-#include "ink_apidefs.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_apidefs.h"
#if HAVE_SYSEXITS_H
#include <sysexits.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_assert.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_assert.h b/lib/ts/ink_assert.h
index cadefcb..02b08c6 100644
--- a/lib/ts/ink_assert.h
+++ b/lib/ts/ink_assert.h
@@ -28,8 +28,8 @@ Assertions
#ifndef _INK_ASSERT_H
#define _INK_ASSERT_H
-#include "ink_apidefs.h"
-#include "ink_error.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_error.h"
#ifdef __cplusplus
extern "C" {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_atomic.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_atomic.h b/lib/ts/ink_atomic.h
index de35075..ad7c323 100644
--- a/lib/ts/ink_atomic.h
+++ b/lib/ts/ink_atomic.h
@@ -41,10 +41,10 @@
#include <string.h>
#include <stdint.h>
#include <assert.h>
-#include "ink_defs.h"
-#include "ink_apidefs.h"
-#include "ink_mutex.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_mutex.h"
typedef volatile int8_t vint8;
typedef volatile int16_t vint16;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_auth_api.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_auth_api.h b/lib/ts/ink_auth_api.h
index bec81b8..93071be 100644
--- a/lib/ts/ink_auth_api.h
+++ b/lib/ts/ink_auth_api.h
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <string.h>
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
typedef union {
uint64_t u64[2];
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_cap.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_cap.h b/lib/ts/ink_cap.h
index 8ce4066..8499626 100644
--- a/lib/ts/ink_cap.h
+++ b/lib/ts/ink_cap.h
@@ -27,7 +27,7 @@
#include <unistd.h>
#include <sys/types.h>
-#include "ink_mutex.h"
+#include "ts/ink_mutex.h"
/// Generate a debug message with the current capabilities for the process.
extern void DebugCapabilities(char const *tag ///< Debug message tag.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_code.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_code.h b/lib/ts/ink_code.h
index 5d71cab..97a2625 100644
--- a/lib/ts/ink_code.h
+++ b/lib/ts/ink_code.h
@@ -24,9 +24,9 @@
#ifndef _ink_code_h_
#define _ink_code_h_
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_defs.h"
#include <openssl/md5.h>
-#include "ink_defs.h"
/* INK_MD5 context. */
typedef MD5_CTX INK_DIGEST_CTX;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_defs.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_defs.h b/lib/ts/ink_defs.h
index d162a8e..ac2a321 100644
--- a/lib/ts/ink_defs.h
+++ b/lib/ts/ink_defs.h
@@ -25,7 +25,7 @@
#define _ink_defs_h
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <stddef.h>
#include <sys/mman.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_error.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_error.h b/lib/ts/ink_error.h
index aa6f8d8..17c6dcf 100644
--- a/lib/ts/ink_error.h
+++ b/lib/ts/ink_error.h
@@ -33,8 +33,8 @@
#define _ink_error_h_
#include <stdarg.h>
-#include "ink_platform.h"
-#include "ink_apidefs.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_apidefs.h"
void ink_fatal_va(const char *message_format, va_list ap) TS_NORETURN;
void ink_fatal(const char *message_format, ...) TS_PRINTFLIKE(1, 2) TS_NORETURN;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_file.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_file.h b/lib/ts/ink_file.h
index fa4e161..89b91aa 100644
--- a/lib/ts/ink_file.h
+++ b/lib/ts/ink_file.h
@@ -32,7 +32,7 @@
#ifndef _ink_file_h_
#define _ink_file_h_
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <stdio.h>
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_hash_table.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_hash_table.h b/lib/ts/ink_hash_table.h
index 2894858..5017d16 100644
--- a/lib/ts/ink_hash_table.h
+++ b/lib/ts/ink_hash_table.h
@@ -36,7 +36,7 @@
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
/*===========================================================================*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_hrtime.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_hrtime.h b/lib/ts/ink_hrtime.h
index e1db113..f084948 100644
--- a/lib/ts/ink_hrtime.h
+++ b/lib/ts/ink_hrtime.h
@@ -31,8 +31,8 @@
#if !defined(_ink_hrtime_h_)
#define _ink_hrtime_h_
-#include "ink_config.h"
-#include "ink_assert.h"
+#include "ts/ink_config.h"
+#include "ts/ink_assert.h"
#include <time.h>
#include <sys/time.h>
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_inet.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_inet.h b/lib/ts/ink_inet.h
index 1b77642..b149f9e 100644
--- a/lib/ts/ink_inet.h
+++ b/lib/ts/ink_inet.h
@@ -28,9 +28,9 @@
#include <netinet/in.h>
#include <netdb.h>
#include <sys/socket.h>
-#include "ink_memory.h"
-#include "ink_apidefs.h"
-#include "TsBuffer.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_apidefs.h"
+#include "ts/TsBuffer.h"
#define INK_GETHOSTBYNAME_R_DATA_SIZE 1024
#define INK_GETHOSTBYADDR_R_DATA_SIZE 1024
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_llqueue.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_llqueue.h b/lib/ts/ink_llqueue.h
index fa25ea0..a63f1d4 100644
--- a/lib/ts/ink_llqueue.h
+++ b/lib/ts/ink_llqueue.h
@@ -29,8 +29,8 @@
A simple linked list queue.
****************************************************************************/
-#include "ink_mutex.h"
-#include "ink_thread.h"
+#include "ts/ink_mutex.h"
+#include "ts/ink_thread.h"
typedef struct llqrec_s {
struct llqrec_s *next;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_lockfile.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_lockfile.h b/lib/ts/ink_lockfile.h
index 6dc6bab..0296d17 100644
--- a/lib/ts/ink_lockfile.h
+++ b/lib/ts/ink_lockfile.h
@@ -24,8 +24,8 @@
#ifndef __INK_LOCKFILE_H__
#define __INK_LOCKFILE_H__
-#include "ink_defs.h"
-#include "ink_string.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_string.h"
#define COP_LOCK "cop.lock"
#define MANAGER_LOCK "manager.lock"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_memory.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_memory.h b/lib/ts/ink_memory.h
index 469d0f1..cf18ed7 100644
--- a/lib/ts/ink_memory.h
+++ b/lib/ts/ink_memory.h
@@ -27,7 +27,7 @@
#include <string.h>
#include <strings.h>
-#include "ink_config.h"
+#include "ts/ink_config.h"
#if HAVE_UNISTD_H
#include <unistd.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_mutex.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_mutex.h b/lib/ts/ink_mutex.h
index 7603627..a01e943 100644
--- a/lib/ts/ink_mutex.h
+++ b/lib/ts/ink_mutex.h
@@ -34,7 +34,7 @@
***********************************************************************/
#include <stdio.h>
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
#if defined(POSIX_THREAD)
#include <pthread.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_platform.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_platform.h b/lib/ts/ink_platform.h
index 251efe0..a67a9ba 100644
--- a/lib/ts/ink_platform.h
+++ b/lib/ts/ink_platform.h
@@ -25,7 +25,7 @@
#ifndef _ink_platform_h
#define _ink_platform_h
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <stdio.h>
#include <stdarg.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_queue.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue.h b/lib/ts/ink_queue.h
index f830111..a5f5ea4 100644
--- a/lib/ts/ink_queue.h
+++ b/lib/ts/ink_queue.h
@@ -34,9 +34,9 @@
***********************************************************************/
-#include "ink_platform.h"
-#include "ink_defs.h"
-#include "ink_apidefs.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_apidefs.h"
/*
For information on the structure of the x86_64 memory map:
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_rand.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_rand.h b/lib/ts/ink_rand.h
index 93c4d51..901b37c 100644
--- a/lib/ts/ink_rand.h
+++ b/lib/ts/ink_rand.h
@@ -62,8 +62,8 @@
#define __INK_RAND_H__
-#include "ink_defs.h"
-#include "ink_apidefs.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_apidefs.h"
class InkRand
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_resolver.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_resolver.h b/lib/ts/ink_resolver.h
index 00bf5b2..314676b 100644
--- a/lib/ts/ink_resolver.h
+++ b/lib/ts/ink_resolver.h
@@ -69,8 +69,9 @@
#ifndef _ink_resolver_h_
#define _ink_resolver_h_
-#include "ink_platform.h"
-#include <ts/ink_inet.h>
+#include "ts/ink_platform.h"
+#include "ts/ink_inet.h"
+
#include <resolv.h>
#include <arpa/nameser.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_resource.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_resource.h b/lib/ts/ink_resource.h
index 02e36e0..7726b0c 100644
--- a/lib/ts/ink_resource.h
+++ b/lib/ts/ink_resource.h
@@ -24,7 +24,7 @@
#ifndef __INK_RESOURCE_H__
#define __INK_RESOURCE_H__
-#include "ink_mutex.h"
+#include "ts/ink_mutex.h"
#include <map>
extern volatile int res_track_memory; /* set this to zero to disable resource tracking */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_rwlock.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_rwlock.h b/lib/ts/ink_rwlock.h
index 01e87be..fd775f6 100644
--- a/lib/ts/ink_rwlock.h
+++ b/lib/ts/ink_rwlock.h
@@ -30,8 +30,8 @@
#ifndef _INK_RWLOCK_H_
#define _INK_RWLOCK_H_
-#include "ink_mutex.h"
-#include "ink_thread.h"
+#include "ts/ink_mutex.h"
+#include "ts/ink_thread.h"
#define RW_MAGIC 0x19283746
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_sock.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_sock.h b/lib/ts/ink_sock.h
index 629ded3..6e73faa 100644
--- a/lib/ts/ink_sock.h
+++ b/lib/ts/ink_sock.h
@@ -30,10 +30,10 @@
#if !defined(_ink_sock_h_)
#define _ink_sock_h_
-#include "ink_platform.h"
-#include "ink_defs.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
int safe_setsockopt(int s, int level, int optname, char *optval, int optlevel);
int safe_getsockopt(int s, int level, int optname, char *optval, int *optlevel);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_sprintf.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_sprintf.h b/lib/ts/ink_sprintf.h
index 7686d0c..5323d7b 100644
--- a/lib/ts/ink_sprintf.h
+++ b/lib/ts/ink_sprintf.h
@@ -36,8 +36,8 @@
#include <stdio.h>
#include <stdarg.h>
-#include "ink_apidefs.h"
-#include "ink_defs.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_defs.h"
int ink_bsprintf(char *buffer, const char *format, ...) TS_PRINTFLIKE(2, 3);
int ink_bvsprintf(char *buffer, const char *format, va_list ap);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_string.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index 74d4ea4..addd9dc 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -36,10 +36,10 @@
#include <memory.h>
#include <strings.h>
-#include "ink_assert.h"
-#include "ink_error.h"
-#include "ParseRules.h"
-#include "ink_apidefs.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_error.h"
+#include "ts/ParseRules.h"
+#include "ts/ink_apidefs.h"
/*===========================================================================*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_thread.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_thread.h b/lib/ts/ink_thread.h
index 0fa4ff7..d916d11 100644
--- a/lib/ts/ink_thread.h
+++ b/lib/ts/ink_thread.h
@@ -30,8 +30,8 @@
#define _INK_THREAD_H
-#include "ink_hrtime.h"
-#include "ink_defs.h"
+#include "ts/ink_hrtime.h"
+#include "ts/ink_defs.h"
#include <sched.h>
@@ -93,9 +93,9 @@ typedef struct timespec ink_timestruc;
typedef timestruc_t ink_timestruc;
#endif
-#include "ink_mutex.h"
#include <errno.h>
-#include "ink_assert.h"
+#include "ts/ink_mutex.h"
+#include "ts/ink_assert.h"
//////////////////////////////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/ink_time.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_time.h b/lib/ts/ink_time.h
index 1da2373..29b33fe 100644
--- a/lib/ts/ink_time.h
+++ b/lib/ts/ink_time.h
@@ -34,9 +34,9 @@
#ifndef _ink_time_h_
#define _ink_time_h_
-#include "ink_platform.h"
-#include "ink_defs.h"
-#include "ink_hrtime.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_hrtime.h"
/*===========================================================================*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/libts.h
----------------------------------------------------------------------
diff --git a/lib/ts/libts.h b/lib/ts/libts.h
index a99e67f..40c6835 100644
--- a/lib/ts/libts.h
+++ b/lib/ts/libts.h
@@ -42,70 +42,70 @@
*/
#include "hugepages.h"
-#include "ink_config.h"
-#include "ink_platform.h"
-#include "ink_align.h"
-#include "ink_apidefs.h"
-#include "ink_args.h"
-#include "ink_assert.h"
-#include "ink_atomic.h"
-#include "ink_base64.h"
-#include "ink_code.h"
-#include "ink_defs.h"
-#include "ink_error.h"
-#include "ink_exception.h"
-#include "ink_file.h"
-#include "ink_hash_table.h"
-#include "ink_hrtime.h"
-#include "ink_inout.h"
-#include "ink_llqueue.h"
-#include "ink_lockfile.h"
-#include "ink_memory.h"
-#include "ink_mutex.h"
-#include "ink_queue.h"
-#include "ink_rand.h"
-#include "ink_resolver.h"
-#include "ink_sock.h"
-#include "ink_inet.h"
-#include "ink_sprintf.h"
-#include "ink_stack_trace.h"
-#include "ink_string++.h"
-#include "ink_string.h"
-#include "ink_syslog.h"
-#include "ink_thread.h"
-#include "ink_time.h"
-#include "fastlz.h"
+#include "ts/ink_config.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_align.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_args.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_atomic.h"
+#include "ts/ink_base64.h"
+#include "ts/ink_code.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_error.h"
+#include "ts/ink_exception.h"
+#include "ts/ink_file.h"
+#include "ts/ink_hash_table.h"
+#include "ts/ink_hrtime.h"
+#include "ts/ink_inout.h"
+#include "ts/ink_llqueue.h"
+#include "ts/ink_lockfile.h"
+#include "ts/ink_memory.h"
+#include "ts/ink_mutex.h"
+#include "ts/ink_queue.h"
+#include "ts/ink_rand.h"
+#include "ts/ink_resolver.h"
+#include "ts/ink_sock.h"
+#include "ts/ink_inet.h"
+#include "ts/ink_sprintf.h"
+#include "ts/ink_stack_trace.h"
+#include "ts/ink_string++.h"
+#include "ts/ink_string.h"
+#include "ts/ink_syslog.h"
+#include "ts/ink_thread.h"
+#include "ts/ink_time.h"
+#include "ts/fastlz.h"
-#include "Allocator.h"
-#include "Arena.h"
-#include "Bitops.h"
-#include "ConsistentHash.h"
-#include "DynArray.h"
-#include "EventNotify.h"
-#include "Hash.h"
-#include "HashFNV.h"
-#include "HashMD5.h"
-#include "HashSip.h"
-#include "I_Version.h"
-#include "InkPool.h"
-#include "List.h"
-#include "INK_MD5.h"
-#include "MMH.h"
-#include "Map.h"
-#include "MimeTable.h"
-#include "ParseRules.h"
-#include "Ptr.h"
-#include "RawHashTable.h"
-#include "Regex.h"
-#include "SimpleTokenizer.h"
-#include "TextBuffer.h"
-#include "Tokenizer.h"
-#include "MatcherUtils.h"
-#include "Diags.h"
-#include "Regression.h"
-#include "HostLookup.h"
-#include "InkErrno.h"
-#include "Vec.h"
-#include "X509HostnameValidator.h"
+#include "ts/Allocator.h"
+#include "ts/Arena.h"
+#include "ts/Bitops.h"
+#include "ts/ConsistentHash.h"
+#include "ts/DynArray.h"
+#include "ts/EventNotify.h"
+#include "ts/Hash.h"
+#include "ts/HashFNV.h"
+#include "ts/HashMD5.h"
+#include "ts/HashSip.h"
+#include "ts/I_Version.h"
+#include "ts/InkPool.h"
+#include "ts/List.h"
+#include "ts/INK_MD5.h"
+#include "ts/MMH.h"
+#include "ts/Map.h"
+#include "ts/MimeTable.h"
+#include "ts/ParseRules.h"
+#include "ts/Ptr.h"
+#include "ts/RawHashTable.h"
+#include "ts/Regex.h"
+#include "ts/SimpleTokenizer.h"
+#include "ts/TextBuffer.h"
+#include "ts/Tokenizer.h"
+#include "ts/MatcherUtils.h"
+#include "ts/Diags.h"
+#include "ts/Regression.h"
+#include "ts/HostLookup.h"
+#include "ts/InkErrno.h"
+#include "ts/Vec.h"
+#include "ts/X509HostnameValidator.h"
#endif /*_inktomiplus_h_*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/test_List.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_List.cc b/lib/ts/test_List.cc
index 86618b0..a09d4fd 100644
--- a/lib/ts/test_List.cc
+++ b/lib/ts/test_List.cc
@@ -22,7 +22,7 @@
*/
-#include "List.h"
+#include "ts/List.h"
class Foo
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/test_Regex.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_Regex.cc b/lib/ts/test_Regex.cc
index 792cdeb..6338a32 100644
--- a/lib/ts/test_Regex.cc
+++ b/lib/ts/test_Regex.cc
@@ -19,9 +19,9 @@
limitations under the License.
*/
-#include <ink_assert.h>
-#include <ink_defs.h>
-#include "Regex.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_defs.h"
+#include "ts/Regex.h"
typedef struct {
char subject[100];
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/test_atomic.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_atomic.cc b/lib/ts/test_atomic.cc
index 932328a..193faf8 100644
--- a/lib/ts/test_atomic.cc
+++ b/lib/ts/test_atomic.cc
@@ -27,9 +27,10 @@
#include <time.h>
#include <poll.h>
#include <pthread.h>
-#include "ink_atomic.h"
-#include "ink_queue.h"
-#include "ink_thread.h"
+
+#include "ts/ink_atomic.h"
+#include "ts/ink_queue.h"
+#include "ts/ink_thread.h"
#ifndef LONG_ATOMICLIST_TEST
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/ts/test_geometry.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_geometry.cc b/lib/ts/test_geometry.cc
index ff14e4c..6d9eaa0 100644
--- a/lib/ts/test_geometry.cc
+++ b/lib/ts/test_geometry.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "ink_platform.h"
+#include "ts/libts.h"
+#include "ts/ink_platform.h"
// This isn't really a unit test. It's just a dumb little program to probe the disk
// geometry of an arbitrary device file. That's useful when figuring out how ATS will
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/lib/tsconfig/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am
index 2c0f41b..c74b260 100644
--- a/lib/tsconfig/Makefile.am
+++ b/lib/tsconfig/Makefile.am
@@ -24,7 +24,10 @@ AM_CFLAGS += @FLEX_CFLAGS@
AM_YFLAGS = --yacc -d -p tsconfig
AM_CPPFLAGS = \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
+ -I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts
BUILT_SOURCES = \
TsConfigGrammar.hpp
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/mgmt/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index da907b4..e65c7d4 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -35,6 +35,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/lib \
-I$(top_builddir)/lib
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/mgmt/api/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am
index 0845ea4..b34cb29 100644
--- a/mgmt/api/Makefile.am
+++ b/mgmt/api/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/utils \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/mgmt/cluster/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/cluster/Makefile.am b/mgmt/cluster/Makefile.am
index cae4ec7..4b15a8e 100644
--- a/mgmt/cluster/Makefile.am
+++ b/mgmt/cluster/Makefile.am
@@ -20,6 +20,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/utils \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/mgmt/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index dd8c043..6295810 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -26,6 +26,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
@OPENSSL_INCLUDES@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
index a9169f1..b572e45 100644
--- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
+++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
@@ -26,16 +26,17 @@
#include <memory.h>
#include <inttypes.h>
#include <ts/ts.h>
-#include <ink_config.h>
#include <tsconfig/TsValue.h>
#include <openssl/ssl.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
-#include <ts/ink_inet.h>
#include <getopt.h>
-#include <ts/IpMap.h>
#include "domain-tree.h"
+#include "ts/ink_inet.h"
+#include "ts/ink_config.h"
+#include "ts/IpMap.h"
+
using ts::config::Configuration;
using ts::config::Value;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 50fd902..c1c17ae 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -37,6 +37,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(srcdir)/http \
-I$(srcdir)/http2 \
-I$(srcdir)/spdy \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/proxy/congest/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/congest/Makefile.am b/proxy/congest/Makefile.am
index 8b9287c..416ad6e 100644
--- a/proxy/congest/Makefile.am
+++ b/proxy/congest/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/mgmt \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/proxy/hdrs/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
index a5be335..6d475d3 100644
--- a/proxy/hdrs/Makefile.am
+++ b/proxy/hdrs/Makefile.am
@@ -20,7 +20,8 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts
+ -I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts
noinst_LIBRARIES = libhdrs.a
EXTRA_PROGRAMS = load_http_hdr
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/proxy/http/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index 258b1ee..478bc1f 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -26,6 +26,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy/hdrs \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/proxy/http/remap/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index 3fb9f4c..e444588 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/mgmt \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/proxy/http2/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http2/Makefile.am b/proxy/http2/Makefile.am
index 7dc06f8..4e0853c 100644
--- a/proxy/http2/Makefile.am
+++ b/proxy/http2/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/proxy/logging/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index 080f3c6..78a901c 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/proxy/shared/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
index 0e16f00..f454e23 100644
--- a/proxy/shared/Makefile.am
+++ b/proxy/shared/Makefile.am
@@ -27,6 +27,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/api \
-I$(top_srcdir)/mgmt/api/include \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36e1dd0a/proxy/spdy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/spdy/Makefile.am b/proxy/spdy/Makefile.am
index 5eaf948..0cd3e0a 100644
--- a/proxy/spdy/Makefile.am
+++ b/proxy/spdy/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/api \