Updated Branches:
  refs/heads/master 86514a0f0 -> 71d8eab9b

TS-1269 Building outside source tree fails on plugins/


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/71d8eab9
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/71d8eab9
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/71d8eab9

Branch: refs/heads/master
Commit: 71d8eab9b5f28ce178b4648f7adf404ac25ec7fa
Parents: 86514a0
Author: Leif Hedstrom <[email protected]>
Authored: Thu May 24 10:16:09 2012 -0600
Committer: Leif Hedstrom <[email protected]>
Committed: Thu May 24 10:16:09 2012 -0600

----------------------------------------------------------------------
 .gitignore                          |    4 ++++
 CHANGES                             |    2 ++
 plugins/header_filter/Makefile.am   |    3 ++-
 plugins/regex_remap/Makefile.am     |    3 ++-
 plugins/stats_over_http/Makefile.am |    2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/71d8eab9/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 09bf734..c26642d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,3 +111,7 @@ lib/tsconfig/test-tsconfig
 
 tools/http_load/http_load
 tools/jtest/jtest
+
+BUILDS
+DEBUG
+RELEASE

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/71d8eab9/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c8c7b88..542d088 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.4
+  *) [TS-1269] Building outside source tree fails on plugins.
+
   *) [TS-1222] single tcp connection will limit the cluster throughput.
 
   *) [TS-475] Accelerated single range requests.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/71d8eab9/plugins/header_filter/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/header_filter/Makefile.am 
b/plugins/header_filter/Makefile.am
index e7e6a87..b86777a 100644
--- a/plugins/header_filter/Makefile.am
+++ b/plugins/header_filter/Makefile.am
@@ -14,7 +14,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-AM_CPPFLAGS = -I$(top_srcdir)/proxy/api
+AM_CPPFLAGS = -I$(top_builddir)/proxy/api -I$(top_srcdir)/proxy/api \
+              -I$(top_srcdir)/lib/ts -I$(top_builddir)/lib/ts
 
 pkglibdir = ${pkglibexecdir}
 pkglib_LTLIBRARIES = header_filter.la

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/71d8eab9/plugins/regex_remap/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/regex_remap/Makefile.am b/plugins/regex_remap/Makefile.am
index ae27d53..08acecf 100644
--- a/plugins/regex_remap/Makefile.am
+++ b/plugins/regex_remap/Makefile.am
@@ -14,7 +14,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-AM_CPPFLAGS = -I$(top_srcdir)/proxy/api
+AM_CPPFLAGS = -I$(top_builddir)/proxy/api -I$(top_srcdir)/proxy/api \
+              -I$(top_srcdir)/lib/ts -I$(top_builddir)/lib/ts
 
 pkglibdir = ${pkglibexecdir}
 pkglib_LTLIBRARIES = regex_remap.la

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/71d8eab9/plugins/stats_over_http/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/stats_over_http/Makefile.am 
b/plugins/stats_over_http/Makefile.am
index 09a96cd..dd9ab64 100644
--- a/plugins/stats_over_http/Makefile.am
+++ b/plugins/stats_over_http/Makefile.am
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-AM_CPPFLAGS = -I$(top_srcdir)/proxy/api
+AM_CPPFLAGS = -I$(top_builddir)/proxy/api -I$(top_srcdir)/proxy/api
 
 pkglibdir = ${pkglibexecdir}
 pkglib_LTLIBRARIES = stats_over_http.la

Reply via email to