Update compilation chain after embedded libyamlcpp removal

Origin: other
Reviewed-by: Jean Baptiste Favre <debian@jbfavre.org>
Last-Update: 2019-01-30

Last-Update: 2019-01-30
Gbp-Pq: Name 0014-use_system_yaml-cpp.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdbb04126285baacf94b5f2fd106a6067b6b0776..9bc36c1feffe267abe0f7aa663b71470584de717 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,6 @@ include_directories(lib
         proxy/shared
         lib/records
         include/wccp
-        lib/yamlcpp/include
         iocore/eventsystem
         iocore/net
         iocore/dns

diff --git a/configure.ac b/configure.ac
index e64c627777aad3659521d804e3e723f08c319d71..30e4409f2473e5ccf6b3f8a1a5bb9bfed0cf2d34 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2074,7 +2074,6 @@ AC_CONFIG_FILES([
   include/tscore/ink_config.h
   lib/tsconfig/Makefile
   src/wccp/Makefile
-  lib/yamlcpp/Makefile
   mgmt/Makefile
   mgmt/api/Makefile
   mgmt/api/include/Makefile

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3db8fd765af94d2daefddd2c81b0d09daff42d1b..ceba88e785967e89af589f3658ae07e25a0f62c0 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,12 +25,6 @@ endif
 # to prevent Clang Analyzer warning
 LOCAL =
 
-if BUILD_YAML_CPP
-LOCAL += yamlcpp
-endif
-
 all-local:     $(LOCAL)
-       $(MAKE) -C yamlcpp
 
 clean-local:
-       $(MAKE) -C yamlcpp clean