You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2013/05/16 23:57:26 UTC
[07/47] git commit: TS-1053: fix sdpy and esi plugin convenience
libraries
TS-1053: fix sdpy and esi plugin convenience libraries
Rename the convenience libraries to avoid potential name conflicts.
Make sure to use noinst_ automake prefixes because we don't want
these to be installed.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f3369df3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f3369df3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f3369df3
Branch: refs/heads/sphinx-docs
Commit: f3369df37419e77fb4bcbd26183cdd4fc4de5fb1
Parents: 96d979d
Author: James Peach <jp...@apache.org>
Authored: Sat May 4 21:35:11 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon May 6 12:51:58 2013 -0700
----------------------------------------------------------------------
plugins/experimental/esi/Makefile.am | 54 +++++++++++++++-------------
plugins/experimental/spdy/Makefile.am | 8 ++--
2 files changed, 33 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3369df3/plugins/experimental/esi/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/Makefile.am b/plugins/experimental/esi/Makefile.am
index f06c0c0..53fbd18 100644
--- a/plugins/experimental/esi/Makefile.am
+++ b/plugins/experimental/esi/Makefile.am
@@ -24,12 +24,12 @@ AM_CPPFLAGS += \
AM_CXXFLAGS = \
-Wno-deprecated
+noinst_LTLIBRARIES = libesicore.la libtest.la
pkglib_LTLIBRARIES = esi.la combo_handler.la
-lib_LTLIBRARIES = libesi.la libtest.la
check_PROGRAMS = docnode_test parser_test processor_test utils_test vars_test
-libesi_la_SOURCES = \
+libesicore_la_SOURCES = \
lib/DocNode.cc \
lib/EsiParser.cc \
lib/EsiGzip.cc \
@@ -43,17 +43,9 @@ libesi_la_SOURCES = \
lib/gzip.cc
libtest_la_SOURCES = \
- lib/DocNode.cc \
- lib/EsiParser.cc \
- lib/EsiGzip.cc \
- lib/EsiProcessor.cc \
- lib/Expression.cc \
- lib/FailureInfo.cc \
- test/TestHandlerManager.cc \
- lib/Stats.cc \
- lib/Utils.cc \
- lib/Variables.cc \
- lib/gzip.cc
+ $(libesicore_la_SOURCES) \
+ test/print_funcs.cc \
+ test/TestHandlerManager.cc
esi_la_SOURCES = \
esi.cc \
@@ -64,22 +56,34 @@ combo_handler_la_SOURCES = \
combo_handler.cc \
fetcher/HttpDataFetcherImpl.cc
-esi_la_LIBADD = libesi.la
+esi_la_LIBADD = libesicore.la
esi_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-combo_handler_la_LIBADD = libesi.la
-combo_handler_la_LDFLAGS = -module -avoid-version -shared
+combo_handler_la_LIBADD = libesicore.la
+combo_handler_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
-docnode_test_SOURCES = test/docnode_test.cc test/print_funcs.cc
-docnode_test_LDADD = libesi.la -lz
-parser_test_SOURCES = test/parser_test.cc test/print_funcs.cc
-parser_test_LDADD = libesi.la -lz
-processor_test_SOURCES = test/processor_test.cc test/HandlerMap.cc test/StubIncludeHandler.cc test/print_funcs.cc
+docnode_test_SOURCES = test/docnode_test.cc
+docnode_test_LDADD = libtest.la -lz
+
+
+parser_test_SOURCES = test/parser_test.cc
+parser_test_LDADD = libtest.la -lz
+
+
+processor_test_SOURCES = \
+ test/processor_test.cc \
+ test/HandlerMap.cc \
+ test/StubIncludeHandler.cc
processor_test_LDADD = libtest.la -lz
-utils_test_SOURCES = test/utils_test.cc test/print_funcs.cc
-utils_test_LDADD = libesi.la -lz
-vars_test_SOURCES = test/vars_test.cc test/print_funcs.cc
-vars_test_LDADD = libesi.la -lz
+
+
+utils_test_SOURCES = test/utils_test.cc
+utils_test_LDADD = libtest.la -lz
+
+
+vars_test_SOURCES = test/vars_test.cc
+vars_test_LDADD = libtest.la -lz
+
TESTS = $(check_PROGRAMS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f3369df3/plugins/experimental/spdy/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/spdy/Makefile.am b/plugins/experimental/spdy/Makefile.am
index 440a9f6..2c32398 100644
--- a/plugins/experimental/spdy/Makefile.am
+++ b/plugins/experimental/spdy/Makefile.am
@@ -19,7 +19,7 @@ include $(top_srcdir)/build/plugins.mk
if BUILD_HAVE_CXX_11
pkglib_LTLIBRARIES = spdy.la
-lib_LTLIBRARIES = libspdy.la
+noinst_LTLIBRARIES = libspdycore.la
check_PROGRAMS = zstream_test
AM_CPPFLAGS += \
@@ -37,16 +37,16 @@ spdy_la_SOURCES = \
stream.cc \
strings.cc
-libspdy_la_SOURCES = \
+libspdycore_la_SOURCES = \
lib/base/logging.cc \
lib/spdy/message.cc \
lib/spdy/zstream.cc
-spdy_la_LIBADD = libspdy.la
+spdy_la_LIBADD = libspdycore.la
spdy_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
zstream_test_SOURCES = tests/zstream_test.cc tests/stubs.cc
-zstream_test_LDADD = libspdy.la -lz
+zstream_test_LDADD = libspdycore.la -lz
TESTS = $(check_PROGRAMS)