Updated Branches: refs/heads/master 898d55ff2 -> 938fa1ec2
fix linking traffic_api_cli_remote on ubuntu Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/938fa1ec Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/938fa1ec Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/938fa1ec Branch: refs/heads/master Commit: 938fa1ec285cb814e5bd94bb08efd71d09b83087 Parents: 898d55f Author: Zhao Yongming <[email protected]> Authored: Sun Nov 17 09:17:19 2013 +0800 Committer: Zhao Yongming <[email protected]> Committed: Wed Nov 20 17:55:49 2013 +0800 ---------------------------------------------------------------------- cmd/traffic_cop/Makefile.am | 1 + cmd/traffic_line/Makefile.am | 1 + cmd/traffic_shell/Makefile.am | 1 + cmd/traffic_top/Makefile.am | 1 + mgmt/api/Makefile.am | 5 +++-- 5 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/938fa1ec/cmd/traffic_cop/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_cop/Makefile.am b/cmd/traffic_cop/Makefile.am index 6403623..f5a25a4 100644 --- a/cmd/traffic_cop/Makefile.am +++ b/cmd/traffic_cop/Makefile.am @@ -36,6 +36,7 @@ traffic_cop_SOURCES = \ traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_cop_LDADD = \ + $(top_builddir)/mgmt/api/libtsmgmtshare.la \ $(top_builddir)/mgmt/api/libtsmgmt.la \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/lib/records/librec4cop.a \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/938fa1ec/cmd/traffic_line/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_line/Makefile.am b/cmd/traffic_line/Makefile.am index 6a2aec3..debf8bd 100644 --- a/cmd/traffic_line/Makefile.am +++ b/cmd/traffic_line/Makefile.am @@ -30,6 +30,7 @@ traffic_line_SOURCES = \ traffic_line_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_line_LDADD = \ + $(top_builddir)/mgmt/api/libtsmgmtshare.la \ $(top_builddir)/mgmt/api/libtsmgmt.la \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBRESOLV@ @LIBTCL@ @LIBSSL@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/938fa1ec/cmd/traffic_shell/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_shell/Makefile.am b/cmd/traffic_shell/Makefile.am index ba3356c..09574cd 100644 --- a/cmd/traffic_shell/Makefile.am +++ b/cmd/traffic_shell/Makefile.am @@ -67,6 +67,7 @@ libtrafficshell_a_SOURCES = \ traffic_shell_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_shell_LDADD = \ libtrafficshell.a \ + $(top_builddir)/mgmt/api/libtsmgmtshare.la \ $(top_builddir)/mgmt/api/libtsmgmt.la \ $(top_builddir)/mgmt/utils/libutils_lm.a \ $(top_builddir)/lib/ts/libtsutil.la \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/938fa1ec/cmd/traffic_top/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am index 51e45e5..d9fc2e5 100644 --- a/cmd/traffic_top/Makefile.am +++ b/cmd/traffic_top/Makefile.am @@ -31,6 +31,7 @@ traffic_top_CXXFLAGS = \ traffic_top_SOURCES = traffic_top.cc traffic_top_LDADD = \ + $(top_builddir)/mgmt/api/libtsmgmtshare.la \ $(top_builddir)/mgmt/api/libtsmgmt.la \ @CURL_LIBS@ @CURSES_LIB@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/938fa1ec/mgmt/api/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am index d07a2b7..bb311a3 100644 --- a/mgmt/api/Makefile.am +++ b/mgmt/api/Makefile.am @@ -35,10 +35,8 @@ DEFS += $(MGMT_DEFS) noinst_LIBRARIES = libmgmtapilocal.a libmgmtapilocal_a_SOURCES = \ - include/mgmtapi.h \ CfgContextDefs.h \ CoreAPI.cc \ - CoreAPI.h \ EventControlMain.cc \ EventControlMain.h \ NetworkUtilsDefs.h \ @@ -61,6 +59,8 @@ libtsmgmtshare_la_SOURCES = \ EventCallback.h \ GenericParser.cc \ GenericParser.h \ + include/mgmtapi.h \ + CoreAPI.h \ INKMgmtAPI.cc if BUILD_TESTS @@ -85,6 +85,7 @@ if BUILD_TESTS endif traffic_api_cli_remote_LDADD = \ + libtsmgmtshare.la \ libtsmgmt.la \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBTCL@ @LIBSSL@
