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:37 UTC
[2/4] trafficserver git commit: TS-3739 Fix in-tree builds of cppapi
TS-3739 Fix in-tree builds of cppapi
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/56a70cc1
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/56a70cc1
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/56a70cc1
Branch: refs/heads/master
Commit: 56a70cc1679e99bc526a992ea296864a1987c4a3
Parents: 7be7e43
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jul 9 20:36:38 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jul 9 20:37:52 2015 -0600
----------------------------------------------------------------------
lib/atscppapi/examples/async_http_fetch/Makefile.am | 13 ++++---------
.../examples/async_http_fetch_streaming/Makefile.am | 13 ++++---------
lib/atscppapi/examples/async_timer/Makefile.am | 13 ++++---------
lib/atscppapi/examples/boom/Makefile.am | 14 +++++---------
lib/atscppapi/examples/boom/boom.cc | 2 +-
lib/atscppapi/examples/clientredirect/Makefile.am | 15 ++++++---------
lib/atscppapi/examples/clientrequest/Makefile.am | 13 ++++---------
lib/atscppapi/examples/customresponse/Makefile.am | 14 +++++---------
lib/atscppapi/examples/globalhook/Makefile.am | 14 +++++---------
.../examples/gzip_transformation/Makefile.am | 13 ++++---------
lib/atscppapi/examples/helloworld/Makefile.am | 14 +++++---------
lib/atscppapi/examples/intercept/Makefile.am | 14 +++++---------
.../internal_transaction_handling/Makefile.am | 14 +++++---------
lib/atscppapi/examples/logger_example/Makefile.am | 13 ++++---------
.../examples/multiple_transaction_hooks/Makefile.am | 15 ++++++---------
.../examples/null_transformation_plugin/Makefile.am | 14 +++++---------
lib/atscppapi/examples/post_buffer/Makefile.am | 14 +++++---------
lib/atscppapi/examples/remap_plugin/Makefile.am | 13 ++++---------
lib/atscppapi/examples/serverresponse/Makefile.am | 14 +++++---------
lib/atscppapi/examples/stat_example/Makefile.am | 13 ++++---------
lib/atscppapi/examples/timeout_example/Makefile.am | 13 ++++---------
lib/atscppapi/examples/transactionhook/Makefile.am | 13 ++++---------
lib/atscppapi/src/include/atscppapi/PluginInit.h | 2 +-
lib/atscppapi/src/include/atscppapi/Transaction.h | 2 +-
24 files changed, 100 insertions(+), 192 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 dd79227..cd4973b 100644
--- a/lib/atscppapi/examples/async_http_fetch/Makefile.am
+++ b/lib/atscppapi/examples/async_http_fetch/Makefile.am
@@ -15,16 +15,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=AsyncHttpFetch.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = AsyncHttpFetch.la
AsyncHttpFetch_la_SOURCES = AsyncHttpFetch.cc
-AsyncHttpFetch_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+AsyncHttpFetch_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 ecc204a..5a3a049 100644
--- a/lib/atscppapi/examples/async_http_fetch_streaming/Makefile.am
+++ b/lib/atscppapi/examples/async_http_fetch_streaming/Makefile.am
@@ -15,16 +15,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=AsyncHttpFetchStreaming.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = AsyncHttpFetchStreaming.la
AsyncHttpFetchStreaming_la_SOURCES = AsyncHttpFetchStreaming.cc
-AsyncHttpFetchStreaming_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+AsyncHttpFetchStreaming_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 363e93a..4df22f7 100644
--- a/lib/atscppapi/examples/async_timer/Makefile.am
+++ b/lib/atscppapi/examples/async_timer/Makefile.am
@@ -15,15 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=AsyncTimer.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = AsyncTimer.la
AsyncTimer_la_SOURCES = AsyncTimer.cc
-AsyncTimer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+AsyncTimer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/examples/boom/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/boom/Makefile.am b/lib/atscppapi/examples/boom/Makefile.am
index 882f6a7..f3a098e 100644
--- a/lib/atscppapi/examples/boom/Makefile.am
+++ b/lib/atscppapi/examples/boom/Makefile.am
@@ -14,15 +14,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=boom.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = boom.la
boom_la_SOURCES = boom.cc
-boom_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+boom_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/examples/boom/boom.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/boom/boom.cc b/lib/atscppapi/examples/boom/boom.cc
index a43a0bc..99bcc5d 100644
--- a/lib/atscppapi/examples/boom/boom.cc
+++ b/lib/atscppapi/examples/boom/boom.cc
@@ -85,7 +85,7 @@ const std::string DEFAULT_ERROR_FILE = "default"; // default.html will be search
const std::string DEFAULT_ERROR_RESPONSE = "<html><body><h1>This page will be back soon</h1></body></html>";
// Default HTTP status code to use after booming
-const int DEFAULT_BOOM_HTTP_STATUS_CODE = 200;
+//const int DEFAULT_BOOM_HTTP_STATUS_CODE = 200;
// Default HTTP status string to use after booming
const std::string DEFAULT_BOOM_HTTP_STATUS = "OK (BOOM)";
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/examples/clientredirect/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/clientredirect/Makefile.am b/lib/atscppapi/examples/clientredirect/Makefile.am
index 6c68195..e1d3fd4 100644
--- a/lib/atscppapi/examples/clientredirect/Makefile.am
+++ b/lib/atscppapi/examples/clientredirect/Makefile.am
@@ -14,15 +14,12 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
target=ClientRedirect.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = ClientRedirect.la
ClientRedirect_la_SOURCES = ClientRedirect.cc
-ClientRedirect_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+ClientRedirect_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/examples/clientrequest/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/clientrequest/Makefile.am b/lib/atscppapi/examples/clientrequest/Makefile.am
index 452c1c0..1a31d4c 100644
--- a/lib/atscppapi/examples/clientrequest/Makefile.am
+++ b/lib/atscppapi/examples/clientrequest/Makefile.am
@@ -15,16 +15,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=ClientRequest.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = ClientRequest.la
ClientRequest_la_SOURCES = ClientRequest.cc
-ClientRequest_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+ClientRequest_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/examples/customresponse/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/customresponse/Makefile.am b/lib/atscppapi/examples/customresponse/Makefile.am
index 5b850fd..8666557 100644
--- a/lib/atscppapi/examples/customresponse/Makefile.am
+++ b/lib/atscppapi/examples/customresponse/Makefile.am
@@ -14,16 +14,12 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=CustomResponse.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = CustomResponse.la
CustomResponse_la_SOURCES = CustomResponse.cc
-CustomResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+CustomResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/examples/globalhook/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/globalhook/Makefile.am b/lib/atscppapi/examples/globalhook/Makefile.am
index a9b301a..f3e30c7 100644
--- a/lib/atscppapi/examples/globalhook/Makefile.am
+++ b/lib/atscppapi/examples/globalhook/Makefile.am
@@ -14,16 +14,12 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=GlobalHookPlugin.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = GlobalHookPlugin.la
GlobalHookPlugin_la_SOURCES = GlobalHookPlugin.cc
-GlobalHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+GlobalHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 98dd8cd..601aa81 100644
--- a/lib/atscppapi/examples/gzip_transformation/Makefile.am
+++ b/lib/atscppapi/examples/gzip_transformation/Makefile.am
@@ -15,16 +15,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=GzipTransformationPlugin.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = GzipTransformationPlugin.la
GzipTransformationPlugin_la_SOURCES = GzipTransformationPlugin.cc
-GzipTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+GzipTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/examples/helloworld/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/helloworld/Makefile.am b/lib/atscppapi/examples/helloworld/Makefile.am
index 9bb13df..b284ad7 100644
--- a/lib/atscppapi/examples/helloworld/Makefile.am
+++ b/lib/atscppapi/examples/helloworld/Makefile.am
@@ -14,16 +14,12 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=HelloWorldPlugin.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = HelloWorldPlugin.la
HelloWorldPlugin_la_SOURCES = HelloWorldPlugin.cc
-HelloWorldPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+HelloWorldPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/examples/intercept/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/intercept/Makefile.am b/lib/atscppapi/examples/intercept/Makefile.am
index 44a4d87..6d3f8a2 100644
--- a/lib/atscppapi/examples/intercept/Makefile.am
+++ b/lib/atscppapi/examples/intercept/Makefile.am
@@ -15,16 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=intercept.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = intercept.la
intercept_la_SOURCES = intercept.cc
-intercept_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+intercept_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 a521c21..9968dcb 100644
--- a/lib/atscppapi/examples/internal_transaction_handling/Makefile.am
+++ b/lib/atscppapi/examples/internal_transaction_handling/Makefile.am
@@ -14,16 +14,12 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=InternalTransactionHandling.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = InternalTransactionHandling.la
InternalTransactionHandling_la_SOURCES = InternalTransactionHandling.cc
-InternalTransactionHandling_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+InternalTransactionHandling_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 892b57f..01b7883 100644
--- a/lib/atscppapi/examples/logger_example/Makefile.am
+++ b/lib/atscppapi/examples/logger_example/Makefile.am
@@ -15,16 +15,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=LoggerExample.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = LoggerExample.la
LoggerExample_la_SOURCES = LoggerExample.cc
-LoggerExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+LoggerExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 5ff7df4..965bc55 100644
--- a/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am
+++ b/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am
@@ -14,15 +14,12 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
target=MultipleTransactionHookPlugins.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = MultipleTransactionHookPlugins.la
MultipleTransactionHookPlugins_la_SOURCES = MultipleTransactionHookPlugins.cc
-MultipleTransactionHookPlugins_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+MultipleTransactionHookPlugins_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 7c196da..7c83da7 100644
--- a/lib/atscppapi/examples/null_transformation_plugin/Makefile.am
+++ b/lib/atscppapi/examples/null_transformation_plugin/Makefile.am
@@ -15,16 +15,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=NullTransformationPlugin.so
-pkglibdir = ${pkglibexecdir}
+
pkglib_LTLIBRARIES = NullTransformationPlugin.la
NullTransformationPlugin_la_SOURCES = NullTransformationPlugin.cc
-NullTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+NullTransformationPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 6829ad3..46a6aee 100644
--- a/lib/atscppapi/examples/post_buffer/Makefile.am
+++ b/lib/atscppapi/examples/post_buffer/Makefile.am
@@ -14,16 +14,12 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=PostBuffer.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = PostBuffer.la
PostBuffer_la_SOURCES = PostBuffer.cc
-PostBuffer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+PostBuffer_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 ec166a4..9c75db5 100644
--- a/lib/atscppapi/examples/remap_plugin/Makefile.am
+++ b/lib/atscppapi/examples/remap_plugin/Makefile.am
@@ -15,16 +15,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=RemapPlugin.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = RemapPlugin.la
RemapPlugin_la_SOURCES = RemapPlugin.cc
-RemapPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+RemapPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/examples/serverresponse/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/serverresponse/Makefile.am b/lib/atscppapi/examples/serverresponse/Makefile.am
index 56cab1e..266e3e7 100644
--- a/lib/atscppapi/examples/serverresponse/Makefile.am
+++ b/lib/atscppapi/examples/serverresponse/Makefile.am
@@ -14,16 +14,12 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=ServerResponse.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = ServerResponse.la
ServerResponse_la_SOURCES = ServerResponse.cc
-ServerResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+ServerResponse_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 6e95a5e..c6fe78a 100644
--- a/lib/atscppapi/examples/stat_example/Makefile.am
+++ b/lib/atscppapi/examples/stat_example/Makefile.am
@@ -15,16 +15,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=StatExample.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = StatExample.la
StatExample_la_SOURCES = StatExample.cc
-StatExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+StatExample_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/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 2c8ae05..2503930 100644
--- a/lib/atscppapi/examples/timeout_example/Makefile.am
+++ b/lib/atscppapi/examples/timeout_example/Makefile.am
@@ -15,16 +15,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=TimeoutExamplePlugin.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = TimeoutExamplePlugin.la
TimeoutExamplePlugin_la_SOURCES = TimeoutExamplePlugin.cc
-TimeoutExamplePlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+TimeoutExamplePlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/examples/transactionhook/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/transactionhook/Makefile.am b/lib/atscppapi/examples/transactionhook/Makefile.am
index 08f2406..90e0d10 100644
--- a/lib/atscppapi/examples/transactionhook/Makefile.am
+++ b/lib/atscppapi/examples/transactionhook/Makefile.am
@@ -15,16 +15,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
+include $(top_srcdir)/build/plugins.mk
+
+AM_CPPFLAGS += -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable
target=TransactionHookPlugin.so
-pkglibdir = ${pkglibexecdir}
pkglib_LTLIBRARIES = TransactionHookPlugin.la
TransactionHookPlugin_la_SOURCES = TransactionHookPlugin.cc
-TransactionHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi
-
-all:
- ln -sf .libs/$(target)
-
-clean-local:
- rm -f $(target)
+TransactionHookPlugin_la_LDFLAGS = -module -avoid-version -shared -L$(top_srcdir)/lib/atscppapi/src/ -latscppapi $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/src/include/atscppapi/PluginInit.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/PluginInit.h b/lib/atscppapi/src/include/atscppapi/PluginInit.h
index f5a4a8a..af44715 100644
--- a/lib/atscppapi/src/include/atscppapi/PluginInit.h
+++ b/lib/atscppapi/src/include/atscppapi/PluginInit.h
@@ -23,7 +23,7 @@
#pragma once
#ifndef ATSCPPAPI_PLUGININIT_H_
#define ATSCPPAPI_PLUGININIT_H_
-#include <../ts/apidefs.h>
+#include <ts/apidefs.h>
#include <atscppapi/utils.h>
extern "C" {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/56a70cc1/lib/atscppapi/src/include/atscppapi/Transaction.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/Transaction.h b/lib/atscppapi/src/include/atscppapi/Transaction.h
index d04c77a..dcd9cf4 100644
--- a/lib/atscppapi/src/include/atscppapi/Transaction.h
+++ b/lib/atscppapi/src/include/atscppapi/Transaction.h
@@ -30,7 +30,7 @@
#include "atscppapi/shared_ptr.h"
#include "atscppapi/ClientRequest.h"
#include "atscppapi/Response.h"
-#include <../ts/apidefs.h>
+#include <ts/apidefs.h>
namespace atscppapi
{
// forward declarations