TS-2977: incorporate libutils into libmgmt Simplify the link topology by incorporating libutils into libmgmt. Management clients don't need to know the gory details.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1bba62b6 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1bba62b6 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1bba62b6 Branch: refs/heads/master Commit: 1bba62b68cad0cfb5bba8d6d4c1b735f80408e88 Parents: 9e6d233 Author: James Peach <jpe...@apache.org> Authored: Thu Jul 31 13:27:50 2014 -0700 Committer: James Peach <jpe...@apache.org> Committed: Fri Aug 1 19:55:45 2014 -0700 ---------------------------------------------------------------------- cmd/traffic_manager/Makefile.am | 4 +--- iocore/aio/Makefile.am | 3 +-- iocore/eventsystem/Makefile.am | 5 ++--- mgmt/Makefile.am | 27 ++++++++++++++++----------- mgmt/cluster/Makefile.am | 4 ++-- mgmt/utils/Makefile.am | 6 +++--- proxy/Makefile.am | 15 +++++---------- 7 files changed, 30 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1bba62b6/cmd/traffic_manager/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am index e547f1d..6ba9bfd 100644 --- a/cmd/traffic_manager/Makefile.am +++ b/cmd/traffic_manager/Makefile.am @@ -45,12 +45,10 @@ traffic_manager_SOURCES = \ traffic_manager_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @EXPAT_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_manager_LDADD = \ - $(top_builddir)/mgmt/libmgmt_lm.a \ - $(top_builddir)/mgmt/cluster/libcluster.a \ + $(top_builddir)/mgmt/libmgmt_lm.la \ $(top_builddir)/mgmt/web2/libweb.a \ $(top_builddir)/mgmt/api/libmgmtapilocal.a \ $(top_builddir)/mgmt/api/libtsmgmtshare.la \ - $(top_builddir)/mgmt/utils/libutils_lm.a \ $(top_builddir)/proxy/hdrs/libhdrs.a \ $(top_builddir)/lib/records/librecords_lm.a \ $(top_builddir)/lib/ts/libtsutil.la \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1bba62b6/iocore/aio/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am index 51adaa2..6972946 100644 --- a/iocore/aio/Makefile.am +++ b/iocore/aio/Makefile.am @@ -51,8 +51,7 @@ test_AIO_CXXFLAGS = \ test_AIO_LDADD = \ libinkaio.a \ $(top_builddir)/lib/records/librecords_p.a \ - $(top_builddir)/mgmt/libmgmt_p.a \ - $(top_builddir)/mgmt/utils/libutils_p.a \ + $(top_builddir)/mgmt/libmgmt_p.la \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/proxy/shared/libUglyLogStubs.a \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1bba62b6/iocore/eventsystem/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am index ce1a432..ba01782 100644 --- a/iocore/eventsystem/Makefile.am +++ b/iocore/eventsystem/Makefile.am @@ -67,7 +67,7 @@ libinkevent_a_SOURCES = \ Thread.cc \ UnixEThread.cc \ UnixEvent.cc \ - UnixEventProcessor.cc + UnixEventProcessor.cc check_PROGRAMS = test_Buffer test_Event @@ -85,8 +85,7 @@ test_CXXFLAGS = \ test_LDADD = \ libinkevent.a \ $(top_builddir)/lib/records/librecords_p.a \ - $(top_builddir)/mgmt/libmgmt_p.a \ - $(top_builddir)/mgmt/utils/libutils_p.a \ + $(top_builddir)/mgmt/libmgmt_p.la \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/proxy/shared/libUglyLogStubs.a \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1bba62b6/mgmt/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am index e76f70d..ce477e1 100644 --- a/mgmt/Makefile.am +++ b/mgmt/Makefile.am @@ -19,7 +19,7 @@ SUBDIRS = cluster utils web2 api -noinst_LIBRARIES = libmgmt_p.a libmgmt_lm.a +noinst_LTLIBRARIES = libmgmt_p.la libmgmt_lm.la AM_CPPFLAGS = \ $(iocore_include_dirs) \ @@ -35,31 +35,36 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_builddir)/lib -libmgmt_p_a_SOURCES = \ +libmgmt_COMMON = \ BaseManager.cc \ BaseManager.h \ MgmtDefs.h \ + RecordsConfig.cc \ + RecordsConfig.h + +libmgmt_p_la_SOURCES = \ + $(libmgmt_COMMON) \ ProcessManager.cc \ ProcessManager.h \ ProxyConfig.cc \ - ProxyConfig.h \ - RecordsConfig.cc \ - RecordsConfig.h + ProxyConfig.h -libmgmt_lm_a_SOURCES = \ +libmgmt_lm_la_SOURCES = \ + $(libmgmt_COMMON) \ Alarms.cc \ Alarms.h \ - BaseManager.cc \ - BaseManager.h \ FileManager.cc \ FileManager.h \ LocalManager.cc \ LocalManager.h \ - MgmtDefs.h \ MultiFile.cc \ MultiFile.h \ - RecordsConfig.cc \ - RecordsConfig.h \ Rollback.cc \ Rollback.h +libmgmt_lm_la_LIBADD = \ + cluster/libcluster.la \ + utils/libutils_lm.la + +libmgmt_p_la_LIBADD = \ + utils/libutils_p.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1bba62b6/mgmt/cluster/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/cluster/Makefile.am b/mgmt/cluster/Makefile.am index c33b045..51d63a0 100644 --- a/mgmt/cluster/Makefile.am +++ b/mgmt/cluster/Makefile.am @@ -27,9 +27,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_builddir)/lib -noinst_LIBRARIES = libcluster.a +noinst_LTLIBRARIES = libcluster.la -libcluster_a_SOURCES = \ +libcluster_la_SOURCES = \ ClusterCom.cc \ ClusterCom.h \ VMap.cc \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1bba62b6/mgmt/utils/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am index 388217a..46b6673 100644 --- a/mgmt/utils/Makefile.am +++ b/mgmt/utils/Makefile.am @@ -34,9 +34,9 @@ AM_CPPFLAGS = \ # header files used by other libraries EXTRA_DIST = MgmtHashTable.h MgmtSocket.h -noinst_LIBRARIES = libutils_lm.a libutils_p.a +noinst_LTLIBRARIES = libutils_lm.la libutils_p.la -libutils_lm_a_SOURCES = \ +libutils_lm_la_SOURCES = \ ExpandingArray.cc \ ExpandingArray.h \ MgmtLocalCleanup.cc \ @@ -45,7 +45,7 @@ libutils_lm_a_SOURCES = \ WebMgmtUtils.cc \ WebMgmtUtils.h -libutils_p_a_SOURCES = \ +libutils_p_la_SOURCES = \ MgmtProcessCleanup.cc \ MgmtUtils.cc \ MgmtUtils.h http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1bba62b6/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 2a3d346..091502b 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -205,8 +205,7 @@ traffic_server_LDADD = \ shared/libdiagsconfig.a \ shared/libsignals.a \ shared/libxml.a \ - $(top_builddir)/mgmt/utils/libutils_p.a \ - $(top_builddir)/mgmt/libmgmt_p.a \ + $(top_builddir)/mgmt/libmgmt_p.la \ $(top_builddir)/iocore/utils/libinkutils.a \ $(top_builddir)/iocore/cluster/libinkcluster.a \ $(top_builddir)/iocore/dns/libinkdns.a \ @@ -250,8 +249,7 @@ traffic_logcat_LDADD = \ shared/libUglyLogStubs.a \ shared/libsignals.a \ shared/libxml.a \ - $(top_builddir)/mgmt/utils/libutils_p.a \ - $(top_builddir)/mgmt/libmgmt_p.a \ + $(top_builddir)/mgmt/libmgmt_p.la \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ @@ -266,8 +264,7 @@ traffic_logstats_LDADD = \ shared/libUglyLogStubs.a \ shared/libsignals.a \ shared/libxml.a \ - $(top_builddir)/mgmt/utils/libutils_p.a \ - $(top_builddir)/mgmt/libmgmt_p.a \ + $(top_builddir)/mgmt/libmgmt_p.la \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ @@ -317,8 +314,7 @@ traffic_sac_LDADD = \ shared/liberror.a \ shared/libsignals.a \ shared/libxml.a \ - $(top_builddir)/mgmt/utils/libutils_p.a \ - $(top_builddir)/mgmt/libmgmt_p.a \ + $(top_builddir)/mgmt/libmgmt_p.la \ $(top_builddir)/iocore/cluster/libinkcluster.a \ $(top_builddir)/iocore/dns/libinkdns.a \ $(top_builddir)/iocore/hostdb/libinkhostdb.a \ @@ -340,9 +336,8 @@ endif test_xml_parser_SOURCES = test_xml_parser.cc test_xml_parser_LDADD = \ + $(top_builddir)/mgmt/libmgmt_p.la \ $(top_builddir)/lib/records/librecords_p.a \ - $(top_builddir)/mgmt/libmgmt_p.a \ - $(top_builddir)/mgmt/utils/libutils_p.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ shared/libsignals.a \
