This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 0c022bff5835b256addf9547640e9d9ae7871fe5
Author: James Peach <jpe...@apache.org>
AuthorDate: Fri Jun 17 09:06:48 2016 -0700
TS-4560: Fix the out-of-tree build
(cherry picked from commit c1b8b12d91cf7fc9c9eb9db0eadafd3fc88f2c39)
---
build/plugins.mk | 2 ++
lib/atscppapi/src/Makefile.am | 5 ++++-
plugins/experimental/multiplexer/Makefile.am | 2 +-
plugins/experimental/webp_transform/Makefile.am | 4 +---
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build/plugins.mk b/build/plugins.mk
index 45c6957..61465a7 100644
--- a/build/plugins.mk
+++ b/build/plugins.mk
@@ -25,6 +25,8 @@ TS_PLUGIN_LDFLAGS = \
TS_PLUGIN_CPPFLAGS = \
-I$(top_builddir)/proxy/api \
-I$(top_srcdir)/proxy/api \
+ -I$(top_srcdir)/lib/atscppapi/src/include \
+ -I$(top_builddir)/lib/atscppapi/src/include \
-I$(top_srcdir)/lib
# Provide a default AM_CPPFLAGS. Automake handles this correctly, but libtool
diff --git a/lib/atscppapi/src/Makefile.am b/lib/atscppapi/src/Makefile.am
index f18ea75..984e55d 100644
--- a/lib/atscppapi/src/Makefile.am
+++ b/lib/atscppapi/src/Makefile.am
@@ -17,6 +17,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/$(subdir)/include \
+ -I$(top_builddir)/$(subdir)/include \
-I$(top_builddir)/proxy/api \
-I$(top_srcdir)/proxy/api \
-I$(top_srcdir)/lib
@@ -75,10 +76,12 @@ library_include_HEADERS =
$(base_include_folder)/GlobalPlugin.h \
$(base_include_folder)/Stat.h \
$(base_include_folder)/Mutex.h \
$(base_include_folder)/RemapPlugin.h \
- $(base_include_folder)/shared_ptr.h \
$(base_include_folder)/Async.h \
$(base_include_folder)/AsyncHttpFetch.h \
$(base_include_folder)/GzipDeflateTransformation.h \
$(base_include_folder)/GzipInflateTransformation.h \
$(base_include_folder)/AsyncTimer.h \
$(base_include_folder)/InterceptPlugin.h
+
+library_include_HEADERS += \
+
$(top_builddir)/$(subdir)/include/atscppapi/shared_ptr.h
diff --git a/plugins/experimental/multiplexer/Makefile.am
b/plugins/experimental/multiplexer/Makefile.am
index 72f527e..e93d45c 100644
--- a/plugins/experimental/multiplexer/Makefile.am
+++ b/plugins/experimental/multiplexer/Makefile.am
@@ -16,7 +16,7 @@
include $(top_srcdir)/build/plugins.mk
-AM_CPPFLAGS += -DPLUGIN_TAG=\"multiplexer\" -I
$(top_srcdir)/lib/atscppapi/src/include
+AM_CPPFLAGS += -DPLUGIN_TAG=\"multiplexer\"
pkglib_LTLIBRARIES = multiplexer.la
diff --git a/plugins/experimental/webp_transform/Makefile.am
b/plugins/experimental/webp_transform/Makefile.am
index 3132fc9..1e3ab26 100644
--- a/plugins/experimental/webp_transform/Makefile.am
+++ b/plugins/experimental/webp_transform/Makefile.am
@@ -17,9 +17,7 @@
include $(top_srcdir)/build/plugins.mk
-AM_CPPFLAGS += \
- -I$(top_srcdir)/lib/atscppapi/src/include \
- $(LIBMAGICKCPP_CFLAGS)
+AM_CPPFLAGS += $(LIBMAGICKCPP_CFLAGS)
AM_CXXFLAGS += \
-Wno-unused-variable
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>.
