Skip to content

mgmt: make libconfigmanager a true static library #10181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
randall merged 1 commit into from
Aug 14, 2023
Merged

mgmt: make libconfigmanager a true static library #10181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions mgmt/config/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions mgmt/rpc/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/traffic_server/Makefile.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@ \
Expand Down