diff --git a/mgmt/config/Makefile.am b/mgmt/config/Makefile.am index 529fb133a7e..9d84e9bf81b 100644 --- a/mgmt/config/Makefile.am +++ b/mgmt/config/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for the Enterprise Management module. +# Makefile.am for the config Management module. # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -17,8 +17,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - - AM_CPPFLAGS += \ $(iocore_include_dirs) \ -I$(abs_top_srcdir)/iocore/utils \ @@ -34,26 +32,16 @@ AM_CPPFLAGS += \ # ^^ all the proxy is to include the PluginCallbacks. -noinst_LTLIBRARIES = libconfigmanager.la -#check_PROGRAMS = test_configfiles - +noinst_LIBRARIES = libconfigmanager.a TESTS = $(check_PROGRAMS) # Protocol library only, no transport. -libconfigmanager_COMMON = \ +libconfigmanager_a_SOURCES = \ FileManager.h \ FileManager.cc \ AddConfigFilesHere.cc - -libconfigmanager_la_SOURCES = \ - $(libconfigmanager_COMMON) - -libconfigmanager_la_LIBADD = \ - $(top_builddir)/src/tscore/libtscore.a - - include $(top_srcdir)/mk/tidy.mk clang-tidy-local: $(DIST_SOURCES) diff --git a/mgmt/rpc/Makefile.am b/mgmt/rpc/Makefile.am index 7fe8c015d2a..2286fff6ec4 100644 --- a/mgmt/rpc/Makefile.am +++ b/mgmt/rpc/Makefile.am @@ -164,10 +164,10 @@ distclean-local: # Build with this file instead of the original one. $(shared_overridable_txn_vars_SOURCES): - echo "#include \"$(top_builddir)/src/shared/$@\"" >$@ + @echo "#include \"$(top_builddir)/src/shared/$@\"" >$@ $(shared_rpc_ipc_client_SOURCES): - echo "#include \"$(top_builddir)/src/shared/rpc/$@\"" >$@ + @echo "#include \"$(top_builddir)/src/shared/rpc/$@\"" >$@ include $(top_srcdir)/mk/tidy.mk diff --git a/src/traffic_server/Makefile.inc b/src/traffic_server/Makefile.inc index ad09b56422b..80bda75596e 100644 --- a/src/traffic_server/Makefile.inc +++ b/src/traffic_server/Makefile.inc @@ -88,7 +88,7 @@ traffic_server_traffic_server_LDADD = \ $(top_builddir)/src/tscpp/util/libtscpputil.la \ $(top_builddir)/mgmt/rpc/libjsonrpc_server.la \ $(top_builddir)/mgmt/rpc/libjsonrpc_protocol.la \ - $(top_builddir)/mgmt/config/libconfigmanager.la \ + $(top_builddir)/mgmt/config/libconfigmanager.a \ $(top_builddir)/mgmt/rpc/librpcpublichandlers.la \ @HWLOC_LIBS@ \ @LIBPCRE@ \