trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [trafficserver] branch 8.0.x updated: Converts libyamlcpp to a 'convenience' library
Date Thu, 21 Jun 2018 22:00:23 GMT
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.0.x by this push:
     new 8646295  Converts libyamlcpp to a 'convenience' library
8646295 is described below

commit 86462957749cb304ba9793e375de6ce874874482
Author: Randall Meyer <randallmeyer@yahoo.com>
AuthorDate: Tue Jun 19 17:03:06 2018 -0700

    Converts libyamlcpp to a 'convenience' library
    
    This allows for it to be linked into shared libraries
    
    (cherry picked from commit f06862e1d2b38a7ad453f39b9e87f2c3ed05fc08)
---
 lib/yamlcpp/Makefile.am | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/lib/yamlcpp/Makefile.am b/lib/yamlcpp/Makefile.am
index c32d00b..05f441a 100644
--- a/lib/yamlcpp/Makefile.am
+++ b/lib/yamlcpp/Makefile.am
@@ -22,13 +22,9 @@ include $(top_srcdir)/build/tidy.mk
 AM_CPPFLAGS += \
 	-I$(abs_top_srcdir)/lib/yamlcpp/include
 
-#WCCP_DEFS = @WCCP_DEFS@
-#DEFS += $(WCCP_DEFS)
+noinst_LTLIBRARIES = libyamlcpp.la
 
-noinst_LIBRARIES = libyamlcpp.a
-# noinst_PROGRAMS = test-cache
-
-libyamlcpp_a_SOURCES = src/binary.cpp \
+libyamlcpp_la_SOURCES = src/binary.cpp \
 src/convert.cpp \
 src/directives.cpp \
 src/emit.cpp \
@@ -57,10 +53,5 @@ src/singledocparser.cpp \
 src/stream.cpp \
 src/tag.cpp
 
-# test_cache_SOURCES = \
-#		wccp-test-cache.cc
-
-# test_cache_LDADD = $(LDADD) -L$(top_builddir)/lib/tsconfig -ltsconfig -L$(top_builddir)/lib/wccp
-lwccp -L$(top_builddir)/lib/ts -ltsutil
-
 clang-tidy-local: $(DIST_SOURCES)
 	$(CXX_Clang_Tidy)


Mime
View raw message