This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new f640807 PR-3724: Fix additional linkage issues.
f640807 is described below
commit f640807ab65235f5bce44ac6ff45f37ce62c429e
Author: Alan M. Carroll <a...@apache.org>
AuthorDate: Fri Sep 14 13:53:35 2018 -0500
PR-3724: Fix additional linkage issues.
---
example/Makefile.am | 48 ++++++++++++------------
plugins/experimental/webp_transform/Makefile.inc | 4 +-
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/example/Makefile.am b/example/Makefile.am
index 6067bfc..56fa287 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -161,30 +161,30 @@ cppapi_WebSocket_la_SOURCES =
cppapi/websocket/WebSocket.cc cppapi/websocket/WSB
cppapi_boom_la_SOURCES = cppapi/boom/boom.cc
cppapi_intercept_la_SOURCES = cppapi/intercept/intercept.cc
-cppapi_AsyncHttpFetchStreaming_la_LIBADD = $(libatscppapi)
-cppapi_AsyncHttpFetch_la_LIBADD = $(libatscppapi)
-cppapi_AsyncTimer_la_LIBADD = $(libatscppapi)
-cppapi_ClientRedirect_la_LIBADD = $(libatscppapi)
-cppapi_ClientRequest_la_LIBADD = $(libatscppapi)
-cppapi_CustomErrorRemapPlugin_la_LIBADD = $(libatscppapi)
-cppapi_CustomResponse_la_LIBADD = $(libatscppapi)
-cppapi_DelayTransformationPlugin_la_LIBADD = $(libatscppapi)
-cppapi_GlobalHookPlugin_la_LIBADD = $(libatscppapi)
-cppapi_GzipTransformationPlugin_la_LIBADD = $(libatscppapi)
-cppapi_HelloWorldPlugin_la_LIBADD = $(libatscppapi)
-cppapi_InternalTransactionHandling_la_LIBADD = $(libatscppapi)
-cppapi_LoggerExample_la_LIBADD = $(libatscppapi)
-cppapi_MultipleTransactionHookPlugins_la_LIBADD = $(libatscppapi)
-cppapi_NullTransformationPlugin_la_LIBADD = $(libatscppapi)
-cppapi_PostBuffer_la_LIBADD = $(libatscppapi)
-cppapi_RemapPlugin_la_LIBADD = $(libatscppapi)
-cppapi_ServerResponse_la_LIBADD = $(libatscppapi)
-cppapi_StatExample_la_LIBADD = $(libatscppapi)
-cppapi_TimeoutExamplePlugin_la_LIBADD = $(libatscppapi)
-cppapi_TransactionHookPlugin_la_LIBADD = $(libatscppapi)
-cppapi_WebSocket_la_LIBADD = $(libatscppapi)
-cppapi_boom_la_LIBADD = $(libatscppapi)
-cppapi_intercept_la_LIBADD = $(libatscppapi)
+cppapi_AsyncHttpFetchStreaming_la_LIBADD = $(libtscppapi)
+cppapi_AsyncHttpFetch_la_LIBADD = $(libtscppapi)
+cppapi_AsyncTimer_la_LIBADD = $(libtscppapi)
+cppapi_ClientRedirect_la_LIBADD = $(libtscppapi)
+cppapi_ClientRequest_la_LIBADD = $(libtscppapi)
+cppapi_CustomErrorRemapPlugin_la_LIBADD = $(libtscppapi)
+cppapi_CustomResponse_la_LIBADD = $(libtscppapi)
+cppapi_DelayTransformationPlugin_la_LIBADD = $(libtscppapi)
+cppapi_GlobalHookPlugin_la_LIBADD = $(libtscppapi)
+cppapi_GzipTransformationPlugin_la_LIBADD = $(libtscppapi)
+cppapi_HelloWorldPlugin_la_LIBADD = $(libtscppapi)
+cppapi_InternalTransactionHandling_la_LIBADD = $(libtscppapi)
+cppapi_LoggerExample_la_LIBADD = $(libtscppapi)
+cppapi_MultipleTransactionHookPlugins_la_LIBADD = $(libtscppapi)
+cppapi_NullTransformationPlugin_la_LIBADD = $(libtscppapi)
+cppapi_PostBuffer_la_LIBADD = $(libtscppapi)
+cppapi_RemapPlugin_la_LIBADD = $(libtscppapi)
+cppapi_ServerResponse_la_LIBADD = $(libtscppapi)
+cppapi_StatExample_la_LIBADD = $(libtscppapi)
+cppapi_TimeoutExamplePlugin_la_LIBADD = $(libtscppapi)
+cppapi_TransactionHookPlugin_la_LIBADD = $(libtscppapi)
+cppapi_WebSocket_la_LIBADD = $(libtscppapi)
+cppapi_boom_la_LIBADD = $(libtscppapi)
+cppapi_intercept_la_LIBADD = $(libtscppapi)
clang-tidy-local: $(DIST_SOURCES)
$(CXX_Clang_Tidy)
diff --git a/plugins/experimental/webp_transform/Makefile.inc
b/plugins/experimental/webp_transform/Makefile.inc
index 8fdd9e1..15ed044 100644
--- a/plugins/experimental/webp_transform/Makefile.inc
+++ b/plugins/experimental/webp_transform/Makefile.inc
@@ -25,8 +25,8 @@ experimental_webp_transform_WebpTransform_la_SOURCES = \
experimental_webp_transform_WebpTransform_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -L$(top_builddir)/lib/cppapi
+ -L$(top_builddir)/src/tscpp/api
experimental_webp_transform_WebpTransform_la_LIBADD = \
- -latscppapi \
+ -ltscppapi \
$(LIBMAGICKCPP_LIBS)
