You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2014/05/21 03:16:27 UTC
git commit: Fix out of tree build issues with apidefs.h
Repository: trafficserver
Updated Branches:
refs/heads/master 0b448335c -> a4dd966ad
Fix out of tree build issues with apidefs.h
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a4dd966a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a4dd966a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a4dd966a
Branch: refs/heads/master
Commit: a4dd966adf6626b75cde41cbdf3b653e6de2c5d2
Parents: 0b44833
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Tue May 20 18:16:00 2014 -0700
Committer: Alan M. Carroll <am...@network-geographics.com>
Committed: Tue May 20 18:16:00 2014 -0700
----------------------------------------------------------------------
iocore/cache/Makefile.am | 1 +
iocore/cluster/Makefile.am | 1 +
iocore/dns/Makefile.am | 1 +
iocore/hostdb/Makefile.am | 1 +
mgmt/Makefile.am | 6 ++++--
mgmt/api/Makefile.am | 3 ++-
mgmt/cluster/Makefile.am | 3 ++-
mgmt/stats/Makefile.am | 3 ++-
mgmt/utils/Makefile.am | 1 +
mgmt/web2/Makefile.am | 3 ++-
proxy/Makefile.am | 3 ++-
proxy/congest/Makefile.am | 1 +
proxy/http/Makefile.am | 1 +
proxy/http/remap/Makefile.am | 1 +
proxy/logging/Makefile.am | 1 +
proxy/shared/Makefile.am | 3 ++-
proxy/spdy/Makefile.am | 1 +
17 files changed, 26 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/iocore/cache/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
index 026b384..68e3090 100644
--- a/iocore/cache/Makefile.am
+++ b/iocore/cache/Makefile.am
@@ -19,6 +19,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/iocore/cluster/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/cluster/Makefile.am b/iocore/cluster/Makefile.am
index 7c5ba27..19bf843 100644
--- a/iocore/cluster/Makefile.am
+++ b/iocore/cluster/Makefile.am
@@ -18,6 +18,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/iocore/dns/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am
index 59e85e2..fb1ec23 100644
--- a/iocore/dns/Makefile.am
+++ b/iocore/dns/Makefile.am
@@ -19,6 +19,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/iocore/hostdb/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index 664135d..ef5d464 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -19,6 +19,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/mgmt/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index e562407..0493e85 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -33,7 +33,8 @@ AM_CPPFLAGS = $(ink_with_modules_local) \
-I$(top_srcdir)/mgmt/stats \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/web2 \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
@@ -54,7 +55,8 @@ libmgmt_p_a_CPPFLAGS = \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib
libmgmt_p_a_SOURCES = \
BaseManager.cc \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/mgmt/api/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am
index 88f4822..20d1c49 100644
--- a/mgmt/api/Makefile.am
+++ b/mgmt/api/Makefile.am
@@ -28,7 +28,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/mgmt/api/include \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/mgmt/cluster/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/cluster/Makefile.am b/mgmt/cluster/Makefile.am
index 1af088f..52fe262 100644
--- a/mgmt/cluster/Makefile.am
+++ b/mgmt/cluster/Makefile.am
@@ -24,7 +24,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/mgmt/web2 \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/mgmt/stats/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/stats/Makefile.am b/mgmt/stats/Makefile.am
index 84dee3b..5d50150 100644
--- a/mgmt/stats/Makefile.am
+++ b/mgmt/stats/Makefile.am
@@ -26,7 +26,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/api/include \
-I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/proxy \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/mgmt/utils/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index 68d59d4..91c81fe 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -28,6 +28,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib
MGMT_DEFS = @MGMT_DEFS@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/mgmt/web2/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/web2/Makefile.am b/mgmt/web2/Makefile.am
index cefbf71..3de8c68 100644
--- a/mgmt/web2/Makefile.am
+++ b/mgmt/web2/Makefile.am
@@ -27,7 +27,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/cluster \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index e4fd83d..755c894 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -46,7 +46,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy/api/ts \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib
noinst_HEADERS = \
ConfigParse.h \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/proxy/congest/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/congest/Makefile.am b/proxy/congest/Makefile.am
index e5f9ec0..8b9287c 100644
--- a/proxy/congest/Makefile.am
+++ b/proxy/congest/Makefile.am
@@ -19,6 +19,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/proxy/http/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index af34467..8ff6985 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/mgmt \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/proxy/http/remap/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index 5b89dec..3fb9f4c 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -19,6 +19,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/proxy/logging/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index 4ccd240..df61ffc 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -19,6 +19,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/proxy/shared/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
index afa0683..2db77e7 100644
--- a/proxy/shared/Makefile.am
+++ b/proxy/shared/Makefile.am
@@ -40,7 +40,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/logging \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib
liberror_a_SOURCES = \
Error.cc
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4dd966a/proxy/spdy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/spdy/Makefile.am b/proxy/spdy/Makefile.am
index a3b5a36..a7c44a9 100644
--- a/proxy/spdy/Makefile.am
+++ b/proxy/spdy/Makefile.am
@@ -19,6 +19,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/lib/ts \
-I$(top_srcdir)/proxy \