Skip to content

Commit fc42f82

Browse files
authored
mgmt: make libconfigmanager a true static library (#10181)
also, silence echo on build
1 parent ba467a8 commit fc42f82

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

mgmt/config/Makefile.am

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Makefile.am for the Enterprise Management module.
2+
# Makefile.am for the config Management module.
33
#
44
# Licensed to the Apache Software Foundation (ASF) under one
55
# or more contributor license agreements. See the NOTICE file
@@ -17,8 +17,6 @@
1717
# See the License for the specific language governing permissions and
1818
# limitations under the License.
1919

20-
21-
2220
AM_CPPFLAGS += \
2321
$(iocore_include_dirs) \
2422
-I$(abs_top_srcdir)/iocore/utils \
@@ -34,26 +32,16 @@ AM_CPPFLAGS += \
3432

3533
# ^^ all the proxy is to include the PluginCallbacks.
3634

37-
noinst_LTLIBRARIES = libconfigmanager.la
38-
#check_PROGRAMS = test_configfiles
39-
35+
noinst_LIBRARIES = libconfigmanager.a
4036

4137
TESTS = $(check_PROGRAMS)
4238

4339
# Protocol library only, no transport.
44-
libconfigmanager_COMMON = \
40+
libconfigmanager_a_SOURCES = \
4541
FileManager.h \
4642
FileManager.cc \
4743
AddConfigFilesHere.cc
4844

49-
50-
libconfigmanager_la_SOURCES = \
51-
$(libconfigmanager_COMMON)
52-
53-
libconfigmanager_la_LIBADD = \
54-
$(top_builddir)/src/tscore/libtscore.a
55-
56-
5745
include $(top_srcdir)/mk/tidy.mk
5846

5947
clang-tidy-local: $(DIST_SOURCES)

mgmt/rpc/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@ distclean-local:
164164

165165
# Build with this file instead of the original one.
166166
$(shared_overridable_txn_vars_SOURCES):
167-
echo "#include \"$(top_builddir)/src/shared/$@\"" >$@
167+
@echo "#include \"$(top_builddir)/src/shared/$@\"" >$@
168168

169169
$(shared_rpc_ipc_client_SOURCES):
170-
echo "#include \"$(top_builddir)/src/shared/rpc/$@\"" >$@
170+
@echo "#include \"$(top_builddir)/src/shared/rpc/$@\"" >$@
171171

172172
include $(top_srcdir)/mk/tidy.mk
173173

src/traffic_server/Makefile.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ traffic_server_traffic_server_LDADD = \
8888
$(top_builddir)/src/tscpp/util/libtscpputil.la \
8989
$(top_builddir)/mgmt/rpc/libjsonrpc_server.la \
9090
$(top_builddir)/mgmt/rpc/libjsonrpc_protocol.la \
91-
$(top_builddir)/mgmt/config/libconfigmanager.la \
91+
$(top_builddir)/mgmt/config/libconfigmanager.a \
9292
$(top_builddir)/mgmt/rpc/librpcpublichandlers.la \
9393
@HWLOC_LIBS@ \
9494
@LIBPCRE@ \

0 commit comments

Comments
 (0)