You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2012/03/17 04:19:25 UTC
git commit: TS-1144: fix out of tree builds
Updated Branches:
refs/heads/master 2cebb2657 -> b4423861e
TS-1144: fix out of tree builds
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b4423861
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b4423861
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b4423861
Branch: refs/heads/master
Commit: b4423861eddf3b7ac6bf72a5cf716bdaa2360339
Parents: 2cebb26
Author: Darrin Jewell <db...@mit.edu>
Authored: Fri Mar 16 20:18:06 2012 -0700
Committer: James Peach <jp...@apache.org>
Committed: Fri Mar 16 20:18:06 2012 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
cop/Makefile.am | 1 +
iocore/aio/Makefile.am | 3 ++-
iocore/cache/Makefile.am | 6 +++++-
iocore/cluster/Makefile.am | 3 +++
iocore/dns/Makefile.am | 4 +++-
iocore/eventsystem/Makefile.am | 3 ++-
iocore/hostdb/Makefile.am | 4 +++-
iocore/net/Makefile.am | 4 +++-
iocore/utils/Makefile.am | 1 +
lib/records/Makefile.am | 3 ++-
lib/ts/Makefile.am | 2 +-
mgmt/Makefile.am | 4 ++++
mgmt/api/Makefile.am | 1 +
mgmt/api/remote/Makefile.am | 1 +
mgmt/cli/Makefile.am | 1 +
mgmt/cluster/Makefile.am | 1 +
mgmt/preparse/Makefile.am | 1 +
mgmt/stats/Makefile.am | 1 +
mgmt/tools/Makefile.am | 1 +
mgmt/utils/Makefile.am | 1 +
mgmt/web2/Makefile.am | 1 +
plugins/conf_remap/Makefile.am | 3 ++-
proxy/Makefile.am | 3 +++
proxy/congest/Makefile.am | 1 +
proxy/hdrs/Makefile.am | 3 ++-
proxy/http/Makefile.am | 3 +++
proxy/http/remap/Makefile.am | 3 +++
proxy/logging/Makefile.am | 3 +++
proxy/stats/Makefile.am | 1 +
30 files changed, 59 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c551a42..f0ffc6f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.3
+ *) [TS-1144] Fix out of tree builds. Author: Darrin Jewell.
+
*) [TS-1138] Fixed off by one range error in IpMap.s
*) [TS-462] Support TLS Server Name Indication (SNI)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/cop/Makefile.am
----------------------------------------------------------------------
diff --git a/cop/Makefile.am b/cop/Makefile.am
index 69b2dad..8aaecf9 100644
--- a/cop/Makefile.am
+++ b/cop/Makefile.am
@@ -20,6 +20,7 @@
AM_CPPFLAGS = $(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/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/b4423861/iocore/aio/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index ca00493..54da3ee 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -19,7 +19,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/iocore/eventsystem \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/records
+ -I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts
DEFS += @IOCORE_MODULARIZED_DEFS@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/iocore/cache/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
index ba5e18f..3f56b6a 100644
--- a/iocore/cache/Makefile.am
+++ b/iocore/cache/Makefile.am
@@ -19,7 +19,8 @@
if STANDALONE_IOCORE
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/lib/records
+ -I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts
ADD_SRC =
else
@@ -27,6 +28,9 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/proxy \
+ -I$(top_builddir)/proxy/api/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/b4423861/iocore/cluster/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/cluster/Makefile.am b/iocore/cluster/Makefile.am
index c76e450..1d8266d 100644
--- a/iocore/cluster/Makefile.am
+++ b/iocore/cluster/Makefile.am
@@ -20,8 +20,11 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/hdrs \
+ -I$(top_builddir)/proxy \
+ -I$(top_builddir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/preparse \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/iocore/dns/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am
index 6697606..c203dfb 100644
--- a/iocore/dns/Makefile.am
+++ b/iocore/dns/Makefile.am
@@ -19,12 +19,14 @@
if STANDALONE_IOCORE
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/lib/records
+ -I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts
else
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/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/b4423861/iocore/eventsystem/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index a17dd4e..0e002c1 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -18,7 +18,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/records
+ -I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts
DEFS += @IOCORE_MODULARIZED_DEFS@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/iocore/hostdb/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index eea11dd..f4661ca 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -19,12 +19,14 @@
if STANDALONE_IOCORE
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/lib/records
+ -I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts
else
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/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/b4423861/iocore/net/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
index fed40de..eafbe41 100644
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@ -19,12 +19,14 @@
if STANDALONE_IOCORE
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/lib/records
+ -I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts
else
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/mgmt \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/iocore/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/utils/Makefile.am b/iocore/utils/Makefile.am
index 95ffa71..ce57dfe 100644
--- a/iocore/utils/Makefile.am
+++ b/iocore/utils/Makefile.am
@@ -19,6 +19,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/iocore/eventsystem
DEFS += @IOCORE_MODULARIZED_DEFS@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/lib/records/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am
index 441324b..3223232 100644
--- a/lib/records/Makefile.am
+++ b/lib/records/Makefile.am
@@ -26,7 +26,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/utils \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/ts
noinst_LIBRARIES = libreclocal.a librecprocess.a
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/lib/ts/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index 0022129..903a6a1 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -155,7 +155,7 @@ libtsutil_la_SOURCES = \
Version.cc
# Special hacks to generate the parser rules
-ParseRules.cc: ParseRulesCType
+$(srcdir)/ParseRules.cc: ParseRulesCType
ParseRulesCType: CompileParseRules
./CompileParseRules
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/mgmt/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index 6d08a52..2dd5451 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -24,6 +24,7 @@ DIST_SUBDIRS = $(SUBDIRS)
AM_CPPFLAGS = $(ink_with_modules_local) \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/mgmt \
@@ -50,9 +51,12 @@ libmgmt_p_a_CPPFLAGS = \
-I$(top_srcdir)/mgmt/preparse \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/web2 \
+ -I$(top_builddir)/proxy \
+ -I$(top_builddir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/lib
libmgmt_p_a_SOURCES = \
BaseManager.cc \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/mgmt/api/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am
index 0d7381e..b3b3c8b 100644
--- a/mgmt/api/Makefile.am
+++ b/mgmt/api/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS = remote include
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/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/b4423861/mgmt/api/remote/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/api/remote/Makefile.am b/mgmt/api/remote/Makefile.am
index 5a2ed83..1febd29 100644
--- a/mgmt/api/remote/Makefile.am
+++ b/mgmt/api/remote/Makefile.am
@@ -17,6 +17,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/api \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/mgmt/cli/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/cli/Makefile.am b/mgmt/cli/Makefile.am
index 13d5595..d0e1254 100644
--- a/mgmt/cli/Makefile.am
+++ b/mgmt/cli/Makefile.am
@@ -22,6 +22,7 @@ SUFFIXES = .java .class .jar .my .def .stb .html
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/tools
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/mgmt/cluster/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/cluster/Makefile.am b/mgmt/cluster/Makefile.am
index 6ebadad..1af088f 100644
--- a/mgmt/cluster/Makefile.am
+++ b/mgmt/cluster/Makefile.am
@@ -19,6 +19,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/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/b4423861/mgmt/preparse/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/preparse/Makefile.am b/mgmt/preparse/Makefile.am
index 548b91d..ca1df1b 100644
--- a/mgmt/preparse/Makefile.am
+++ b/mgmt/preparse/Makefile.am
@@ -16,6 +16,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy/hdrs
MGMT_DEFS = @MGMT_DEFS@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/mgmt/stats/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/stats/Makefile.am b/mgmt/stats/Makefile.am
index 0154477..84dee3b 100644
--- a/mgmt/stats/Makefile.am
+++ b/mgmt/stats/Makefile.am
@@ -19,6 +19,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/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/b4423861/mgmt/tools/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/tools/Makefile.am b/mgmt/tools/Makefile.am
index 7ebb374..d992b6f 100644
--- a/mgmt/tools/Makefile.am
+++ b/mgmt/tools/Makefile.am
@@ -20,6 +20,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/api \
-I$(top_srcdir)/mgmt/api/include \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/mgmt/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index 03413fa..145a4ba 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -27,6 +27,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/tsconfig \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/lib
MGMT_DEFS = @MGMT_DEFS@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/mgmt/web2/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/web2/Makefile.am b/mgmt/web2/Makefile.am
index 7e0a28b..409683d 100644
--- a/mgmt/web2/Makefile.am
+++ b/mgmt/web2/Makefile.am
@@ -20,6 +20,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/iocore/utils \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/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/b4423861/plugins/conf_remap/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/conf_remap/Makefile.am b/plugins/conf_remap/Makefile.am
index ef66f58..33722cf 100644
--- a/plugins/conf_remap/Makefile.am
+++ b/plugins/conf_remap/Makefile.am
@@ -14,7 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CXXFLAGS+=-I$(top_srcdir)/proxy/api
+AM_CXXFLAGS = -I$(top_builddir)/proxy/api \
+ -I$(top_srcdir)/proxy/api
pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = conf_remap.la
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 56fc5bd..6ebc123 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -34,6 +34,7 @@ endif
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
-I$(srcdir)/http \
-I$(srcdir)/logging \
-I$(srcdir)/http/remap \
@@ -42,6 +43,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/preparse \
-I$(top_srcdir)/mgmt/utils \
-I$(srcdir)/api/ts \
+ -I$(builddir) \
+ -I$(builddir)/api/ts \
-I$(top_srcdir)/lib
noinst_HEADERS = \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/proxy/congest/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/congest/Makefile.am b/proxy/congest/Makefile.am
index 4eb11f1..bb15104 100644
--- a/proxy/congest/Makefile.am
+++ b/proxy/congest/Makefile.am
@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/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/b4423861/proxy/hdrs/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
index be8f0fc..2a96ede 100644
--- a/proxy/hdrs/Makefile.am
+++ b/proxy/hdrs/Makefile.am
@@ -19,7 +19,8 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/records
+ -I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts
noinst_LIBRARIES = libhdrs.a
EXTRA_PROGRAMS = load_http_hdr
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/proxy/http/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index 58c82c2..ed4a2f8 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -20,9 +20,12 @@ SUBDIRS = remap
AM_CPPFLAGS = \
$(iocore_include_dirs) \
+ -I$(top_builddir)/proxy \
+ -I$(top_builddir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/preparse \
-I$(top_srcdir)/mgmt/utils \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/proxy/http/remap/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index 836f8bf..a5c186c 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -20,6 +20,9 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/proxy \
+ -I$(top_builddir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/preparse \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/proxy/logging/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index b9417ff..14df7a0 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -22,6 +22,9 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/proxy \
+ -I$(top_builddir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/http/remap \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4423861/proxy/stats/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/stats/Makefile.am b/proxy/stats/Makefile.am
index 35a7dbc..ed48537 100644
--- a/proxy/stats/Makefile.am
+++ b/proxy/stats/Makefile.am
@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
+ -I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils