TS-2172: iocore and proxy Makefile.am cleanup

clean up all the cross directory compiling from iocore and mgmt
move some shared files into proxy/shared and seperated .a

.gitignore

@@ -66,13 +66,13 @@ proxy/config/storage.config.default
 plugins/experimental/esi/*_test
 plugins/experimental/spdy/zstream_test
 
-mgmt/api/remote/traffic_api_cli_remote
+mgmt/api/traffic_api_cli_remote
 mgmt/tools/traffic_mcast_snoop
 mgmt/tools/traffic_net_config
 mgmt/tools/traffic_shmem_clean
 mgmt/tools/traffic_time_config
 mgmt/tools/traffic_vip_config
-mgmt/api/remote/api_cli_remote
+mgmt/api/api_cli_remote
 mgmt/cli/traffic_line
 mgmt/cli/traffic_shell
 mgmt/tools/shmem_clean

Makefile.am

@@ -29,9 +29,9 @@ export CCACHE_BASEDIR
 # proxy/api/ts has to be built first, since so much of libraries and "core
 # depends on the generates ts/ts.h include file.
 if STANDALONE_IOCORE
-SUBDIRS =  proxy/api/ts iocore lib proxy/hdrs mgmt proxy cop plugins tools example
+SUBDIRS =  proxy/api/ts iocore lib proxy/hdrs proxy/shared mgmt proxy cop plugins tools example
 else
-SUBDIRS =  proxy/api/ts iocore lib proxy/hdrs mgmt proxy cop rc doc plugins tools example
+SUBDIRS =  proxy/api/ts iocore lib proxy/hdrs proxy/shared mgmt proxy cop rc doc plugins tools example
 endif
 
 DIST_BUILD_USER=`id -nu`

configure.ac

@@ -1925,6 +1925,7 @@ AC_CONFIG_FILES([
   proxy/config/storage.config.default
   proxy/congest/Makefile
   proxy/hdrs/Makefile
+  proxy/shared/Makefile
   proxy/http/Makefile
   proxy/http/remap/Makefile
   proxy/logging/Makefile

iocore/aio/Makefile.am

@@ -51,6 +51,6 @@ test_AIO_LDADD = \
   $(top_builddir)/mgmt/utils/libutils_p.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/libUglyLogStubs.a \
+  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
   @LIBTCL@
 

iocore/cache/Makefile.am

@@ -34,6 +34,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/hdrs \
   -I$(top_srcdir)/proxy/http \
+  -I$(top_srcdir)/proxy/shared \
   -I$(top_srcdir)/proxy/http/remap \
   -I$(top_srcdir)/mgmt \
   -I$(top_srcdir)/mgmt/preparse \

iocore/eventsystem/Makefile.am

@@ -91,7 +91,7 @@ test_LDADD = \
   $(top_builddir)/mgmt/utils/libutils_p.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/proxy/libUglyLogStubs.a \
+  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
   @LIBTCL@
 
 test_Buffer_SOURCES = test_Buffer.cc

mgmt/Makefile.am

@@ -26,6 +26,7 @@ AM_CPPFLAGS = $(ink_with_modules_local) \
   -I$(top_srcdir)/lib/ts \
   -I$(top_srcdir)/proxy \
   -I$(top_srcdir)/proxy/hdrs \
+  -I$(top_srcdir)/proxy/shared \
   -I$(top_srcdir)/mgmt \
   -I$(top_srcdir)/mgmt/api/include \
   -I$(top_srcdir)/mgmt/cluster \
@@ -100,8 +101,8 @@ traffic_manager_LDADD = \
   $(top_builddir)/lib/records/libreclocal.a \
   $(top_builddir)/lib/ts/libtsutil.la \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/proxy/liberror.a \
-  $(top_builddir)/proxy/libdiagsconfig.a \
+  $(top_builddir)/proxy/shared/liberror.a \
+  $(top_builddir)/proxy/shared/libdiagsconfig.a \
   @LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ \
   -lm
 

mgmt/api/Makefile.am

@@ -47,7 +47,7 @@ libmgmtapilocal_a_SOURCES = \
   TSControlMain.cc \
   TSControlMain.h
 
-lib_LTLIBRARIES = libtsmgmt.la libtsmgmtshare.la
+lib_LTLIBRARIES = libtsmgmtshare.la libtsmgmt.la
 libtsmgmtshare_la_SOURCES = \
   CfgContextImpl.cc \
   CfgContextImpl.h \

proxy/Makefile.am

@@ -18,7 +18,7 @@
 
 # Note that hdrs is targeted from ../Makefile.am
 if STANDALONE_IOCORE
-noinst_LIBRARIES = libTrafficServerStandalone.a liberror.a libdiagsconfig.a libUglyLogStubs.a
+noinst_LIBRARIES = libTrafficServerStandalone.a
 bin_PROGRAMS =
 else
 SUBDIRS = congest http logging config
@@ -46,6 +46,7 @@ AM_CPPFLAGS = \
   -I$(srcdir)/logging \
   -I$(srcdir)/http/remap  \
   -I$(srcdir)/hdrs \
+  -I$(srcdir)/shared \
   -I$(top_srcdir)/mgmt \
   -I$(top_srcdir)/mgmt/preparse \
   -I$(top_srcdir)/mgmt/utils \
@@ -80,11 +81,7 @@ traffic_server_SOURCES = \
   ControlMatcher.h \
   CoreUtils.cc \
   CoreUtils.h \
-  DiagsConfig.cc \
-  DiagsConfig.h \
   DynamicStats.h \
-  Error.cc \
-  Error.h \
   EventName.cc \
   HttpTransStats.h \
   ICP.cc \
@@ -144,6 +141,8 @@ traffic_server_LDADD = \
   logging/liblogging.a \
   logging/liblogcollation.a \
   hdrs/libhdrs.a  \
+  shared/liberror.a  \
+  shared/libdiagsconfig.a  \
   $(top_builddir)/mgmt/preparse/libpreparse.a \
   $(top_builddir)/mgmt/utils/libutils_p.a \
   $(top_builddir)/mgmt/libmgmt_p.a \
@@ -180,12 +179,12 @@ endif
 traffic_logcat_SOURCES = \
   logcat.cc \
   signals.cc \
-  InkXml.cc \
-  DiagsConfig.cc \
-  UglyLogStubs.cc
+  InkXml.cc
 traffic_logcat_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 traffic_logcat_LDADD = \
   logging/liblogging.a \
+  shared/libdiagsconfig.a \
+  shared/libUglyLogStubs.a \
   $(top_builddir)/mgmt/utils/libutils_p.a \
   $(top_builddir)/mgmt/libmgmt_p.a \
   $(top_builddir)/lib/records/librecprocess.a \
@@ -197,12 +196,12 @@ traffic_logcat_LDADD = \
 traffic_logstats_SOURCES = \
   logstats.cc \
   signals.cc \
-  InkXml.cc \
-  DiagsConfig.cc \
-  UglyLogStubs.cc
+  InkXml.cc
 traffic_logstats_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 traffic_logstats_LDADD = \
   logging/liblogging.a \
+  shared/libdiagsconfig.a \
+  shared/libUglyLogStubs.a \
   $(top_builddir)/mgmt/utils/libutils_p.a \
   $(top_builddir)/mgmt/libmgmt_p.a \
   $(top_builddir)/lib/records/librecprocess.a \
@@ -225,9 +224,7 @@ traffic_sac_SOURCES = \
   StatSystem.cc \
   ReverseProxy.cc \
   signals.cc \
-  Error.cc \
   EventName.cc \
-  DiagsConfig.cc \
   StatPages.cc \
   PluginVC.cc \
   AbstractBuffer.cc \
@@ -243,11 +240,13 @@ traffic_sac_SOURCES = \
 traffic_sac_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 traffic_sac_LDADD = \
   http/libhttp.a \
+  shared/libdiagsconfig.a \
   http/remap/libhttp_remap.a \
   congest/libCongestionControl.a \
   logging/liblogging.a \
   logging/liblogcollation.a \
   hdrs/libhdrs.a \
+  shared/liberror.a \
   $(top_builddir)/mgmt/preparse/libpreparse.a \
   $(top_builddir)/mgmt/utils/libutils_p.a \
   $(top_builddir)/mgmt/libmgmt_p.a \
@@ -271,23 +270,12 @@ endif
 
 libTrafficServerStandalone_a_SOURCES = \
   signals.cc \
-  Error.cc \
   EventName.cc \
-  DiagsConfig.cc \
   StatPages.cc \
   StatSystem.cc \
   AbstractBuffer.cc \
   Initialize.cc
 
-liberror_a_SOURCES = \
-  Error.cc
-
-libdiagsconfig_a_SOURCES = \
-  DiagsConfig.cc
-
-libUglyLogStubs_a_SOURCES = \
-  UglyLogStubs.cc
-
 test_xml_parser_SOURCES = test_xml_parser.cc InkXml.cc
 test_xml_parser_LDADD = \
   $(top_builddir)/lib/records/librecprocess.a \

proxy/congest/Makefile.am

@@ -26,6 +26,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/mgmt \
   -I$(top_srcdir)/mgmt/preparse \
   -I$(top_srcdir)/mgmt/utils \
+  -I$(top_srcdir)/proxy/shared \
   -I$(top_srcdir)/proxy/hdrs
 
 noinst_LIBRARIES = libCongestionControl.a

proxy/http/Makefile.am

@@ -30,6 +30,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/mgmt/preparse \
   -I$(top_srcdir)/mgmt/utils \
   -I$(top_srcdir)/proxy/hdrs \
+  -I$(top_srcdir)/proxy/shared \
   -I$(top_srcdir)/proxy/http/remap \
   -I$(top_srcdir)/proxy/logging
 

proxy/http/remap/Makefile.am

@@ -27,6 +27,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/mgmt \
   -I$(top_srcdir)/mgmt/utils \
   -I$(top_srcdir)/proxy/hdrs \
+  -I$(top_srcdir)/proxy/shared \
   -I$(top_srcdir)/proxy/http
 
 noinst_LIBRARIES = libhttp_remap.a

proxy/logging/Makefile.am

@@ -27,6 +27,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/proxy/http \
   -I$(top_srcdir)/proxy/http/remap \
   -I$(top_srcdir)/proxy/hdrs \
+  -I$(top_srcdir)/proxy/shared \
   -I$(top_srcdir)/mgmt \
   -I$(top_srcdir)/mgmt/preparse \
   -I$(top_srcdir)/mgmt/utils

proxy/shared/Makefile.am

@@ -0,0 +1,52 @@
+# proxy Makefile.am
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+# Note that hdrs is targeted from ../Makefile.am
+noinst_LIBRARIES = liberror.a libdiagsconfig.a libUglyLogStubs.a
+bin_PROGRAMS =
+
+AM_CPPFLAGS = \
+  $(iocore_include_dirs) \
+  -I$(top_srcdir)/lib/records \
+  -I$(top_srcdir)/lib/ts \
+  -I$(top_srcdir)/mgmt \
+  -I$(top_srcdir)/mgmt/web2 \
+  -I$(top_srcdir)/mgmt/api \
+  -I$(top_srcdir)/mgmt/api/include \
+  -I$(top_srcdir)/mgmt/cluster \
+  -I$(top_srcdir)/mgmt/preparse \
+  -I$(top_srcdir)/mgmt/utils \
+  -I$(top_srcdir)/. \
+  -I$(top_builddir)/proxy \
+  -I$(top_builddir)/proxy/api/ts \
+  -I$(top_srcdir)/proxy \
+  -I$(top_srcdir)/proxy/http \
+  -I$(top_srcdir)/proxy/hdrs \
+  -I$(top_srcdir)/proxy/api/ts \
+  -I$(top_srcdir)/proxy/logging \
+  -I$(top_srcdir)/lib
+
+liberror_a_SOURCES = \
+  Error.cc
+
+libdiagsconfig_a_SOURCES = \
+  DiagsConfig.cc
+
+libUglyLogStubs_a_SOURCES = \
+  UglyLogStubs.cc
+