This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new e8017b4f04 Changes libtscore to an archive lib for the standard
Makefile.am build (#9986)
e8017b4f04 is described below
commit e8017b4f041312ce4db175ebc981ac5a1f8c7c68
Author: Leif Hedstrom <[email protected]>
AuthorDate: Mon Jul 17 11:01:35 2023 -0600
Changes libtscore to an archive lib for the standard Makefile.am build
(#9986)
* Changes libtscore an archive lib
* Trying to add a second commit, to force some updates
---
include/tscpp/api/Makefile.am | 56 ++++++++---------
include/tscpp/util/Makefile.am | 6 +-
iocore/aio/Makefile.am | 4 +-
iocore/cache/Makefile.am | 3 +-
iocore/eventsystem/Makefile.am | 10 +--
iocore/hostdb/Makefile.am | 8 +--
iocore/io_uring/Makefile.am | 2 +-
iocore/net/Makefile.am | 23 ++++---
iocore/net/quic/Makefile.am | 2 +-
mgmt/Makefile.am | 2 +-
mgmt/config/Makefile.am | 24 +++----
mgmt/rpc/Makefile.am | 12 ++--
plugins/cache_promote/Makefile.inc | 10 +--
plugins/cache_range_requests/Makefile.inc | 2 +-
plugins/cachekey/Makefile.inc | 10 +--
plugins/experimental/access_control/Makefile.inc | 16 ++---
plugins/experimental/cache_key_genid/Makefile.inc | 2 +-
.../experimental/collapsed_forwarding/Makefile.inc | 2 +-
plugins/experimental/custom_redirect/Makefile.inc | 2 +-
plugins/experimental/fq_pacing/Makefile.inc | 2 +-
plugins/experimental/geoip_acl/Makefile.inc | 4 +-
plugins/experimental/header_freq/Makefile.inc | 2 +-
plugins/experimental/hook-trace/Makefile.inc | 2 +-
plugins/experimental/http_stats/Makefile.inc | 4 +-
plugins/experimental/icap/Makefile.inc | 3 +-
plugins/experimental/inliner/Makefile.inc | 14 ++---
plugins/experimental/magick/Makefile.inc | 10 +--
plugins/experimental/maxmind_acl/Makefile.inc | 6 +-
plugins/experimental/memcache/Makefile.inc | 20 +++---
plugins/experimental/memory_profile/Makefile.inc | 4 +-
plugins/experimental/metalink/Makefile.inc | 2 +-
plugins/experimental/money_trace/Makefile.inc | 3 +-
plugins/experimental/mp4/Makefile.inc | 8 +--
plugins/experimental/otel_tracer/Makefile.inc | 6 +-
plugins/experimental/parent_select/Makefile.inc | 12 ++--
plugins/experimental/rate_limit/Makefile.inc | 12 ++--
.../experimental/redo_cache_lookup/Makefile.inc | 7 +--
plugins/experimental/remap_stats/Makefile.inc | 2 +-
plugins/experimental/slice/Makefile.inc | 64 +++++++++----------
plugins/experimental/sslheaders/Makefile.inc | 2 +-
plugins/experimental/statichit/Makefile.inc | 2 +-
plugins/experimental/stek_share/Makefile.inc | 2 +-
plugins/experimental/stream_editor/Makefile.inc | 2 +-
plugins/experimental/tls_bridge/Makefile.inc | 7 +--
plugins/experimental/uri_signing/Makefile.inc | 26 ++++----
plugins/experimental/wasm/Makefile.inc | 73 +++++++++++-----------
plugins/experimental/webp_transform/Makefile.inc | 10 +--
plugins/lua/Makefile.inc | 56 ++++++++---------
plugins/multiplexer/Makefile.inc | 14 ++---
plugins/prefetch/Makefile.inc | 20 +++---
plugins/remap_purge/Makefile.inc | 2 +-
plugins/server_push_preload/Makefile.inc | 7 +--
proxy/hdrs/Makefile.am | 34 +++++-----
proxy/http/Makefile.am | 14 +++--
proxy/http/remap/Makefile.am | 50 ++++++++-------
proxy/http2/Makefile.am | 17 ++---
proxy/http3/Makefile.am | 2 +-
proxy/logging/Makefile.am | 8 +--
src/records/Makefile.am | 8 +--
src/traffic_cache_tool/Makefile.inc | 19 +-----
src/traffic_crashlog/Makefile.inc | 4 +-
src/traffic_ctl/Makefile.inc | 12 +++-
src/traffic_layout/Makefile.inc | 4 +-
src/traffic_logcat/Makefile.inc | 12 ++--
src/traffic_logstats/Makefile.inc | 21 ++++---
src/traffic_quic/Makefile.inc | 2 +-
src/traffic_server/Makefile.inc | 17 ++---
src/traffic_top/Makefile.inc | 5 +-
src/traffic_via/Makefile.inc | 6 +-
src/traffic_wccp/Makefile.inc | 18 +++---
src/tscore/Makefile.am | 37 ++++-------
tests/gold_tests/jsonrpc/plugins/Makefile.inc | 8 +--
tools/Makefile.am | 2 +-
73 files changed, 446 insertions(+), 460 deletions(-)
diff --git a/include/tscpp/api/Makefile.am b/include/tscpp/api/Makefile.am
index 9dc535c43f..556e0a9b69 100644
--- a/include/tscpp/api/Makefile.am
+++ b/include/tscpp/api/Makefile.am
@@ -18,31 +18,31 @@
library_includedir = $(includedir)/tscpp/api
library_include_HEADERS = \
- Async.h \
- AsyncHttpFetch.h \
- AsyncTimer.h \
- CaseInsensitiveStringComparator.h \
- Cleanup.h \
- ClientRequest.h \
- Continuation.h \
- GlobalPlugin.h \
- GzipDeflateTransformation.h \
- GzipInflateTransformation.h \
- Headers.h \
- HttpMethod.h \
- HttpStatus.h \
- HttpVersion.h \
- InterceptPlugin.h \
- Logger.h \
- Plugin.h \
- PluginInit.h \
- RemapPlugin.h \
- Request.h \
- Response.h \
- Stat.h \
- Transaction.h \
- TransactionPlugin.h \
- TransformationPlugin.h \
- Url.h \
- noncopyable.h \
- utils.h
+ Async.h \
+ AsyncHttpFetch.h \
+ AsyncTimer.h \
+ CaseInsensitiveStringComparator.h \
+ Cleanup.h \
+ ClientRequest.h \
+ Continuation.h \
+ GlobalPlugin.h \
+ GzipDeflateTransformation.h \
+ GzipInflateTransformation.h \
+ Headers.h \
+ HttpMethod.h \
+ HttpStatus.h \
+ HttpVersion.h \
+ InterceptPlugin.h \
+ Logger.h \
+ Plugin.h \
+ PluginInit.h \
+ RemapPlugin.h \
+ Request.h \
+ Response.h \
+ Stat.h \
+ Transaction.h \
+ TransactionPlugin.h \
+ TransformationPlugin.h \
+ Url.h \
+ noncopyable.h \
+ utils.h
diff --git a/include/tscpp/util/Makefile.am b/include/tscpp/util/Makefile.am
index 3d583282ce..06ac9e5bc3 100644
--- a/include/tscpp/util/Makefile.am
+++ b/include/tscpp/util/Makefile.am
@@ -19,8 +19,8 @@
library_includedir=$(includedir)/tscpp/util
library_include_HEADERS = \
- ts_diag_levels.h \
- ts_ip.h \
+ ts_diag_levels.h \
+ ts_ip.h \
IntrusiveDList.h \
LocalBuffer.h \
PostScript.h \
@@ -29,4 +29,4 @@ library_include_HEADERS = \
TsSharedMutex.h \
ts_unit_parser.h \
ts_time_parser.h \
- YamlCfg.h
+ YamlCfg.h
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index ae5da0cce6..0f767f235f 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -55,9 +55,9 @@ test_AIO_LDADD = \
libinkaio.a \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@
+ @SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@ @LIBPCRE@ @LIBCAP@
include $(top_srcdir)/mk/tidy.mk
diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
index 07b6082d35..1310ecc516 100644
--- a/iocore/cache/Makefile.am
+++ b/iocore/cache/Makefile.am
@@ -98,8 +98,8 @@ test_LDADD = \
$(top_builddir)/proxy/shared/libdiagsconfig.a \
$(top_builddir)/iocore/utils/libinkutils.a \
$(top_builddir)/iocore/aio/libinkaio.a \
- $(top_builddir)/src/tscore/libtscore.la \
$(top_builddir)/src/records/librecords_p.a \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/lib/fastlz/libfastlz.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
@SWOC_LIBS@ \
@@ -111,6 +111,7 @@ test_LDADD = \
@LIBPROFILER@ \
@OPENSSL_LIBS@ \
@YAMLCPP_LIBS@ \
+ @LIBCAP@ \
-lm
if ENABLE_QUIC
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index 8d1757307c..b49cb0091d 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -63,8 +63,8 @@ libinkevent_a_SOURCES = \
Processor.cc \
ProtectedQueue.cc \
ProxyAllocator.cc \
- RecProcess.cc \
- RecRawStatsImpl.cc \
+ RecProcess.cc \
+ RecRawStatsImpl.cc \
SocketManager.cc \
Tasks.cc \
Thread.cc \
@@ -81,7 +81,7 @@ check_PROGRAMS = test_IOBuffer \
test_LD_FLAGS = \
@AM_LDFLAGS@ \
- @OPENSSL_LDFLAGS@ @SWOC_LDFLAGS@ @YAMLCPP_LDFLAGS@
+ @OPENSSL_LDFLAGS@ @SWOC_LDFLAGS@ @YAMLCPP_LDFLAGS@ @LIBPCRE@
test_CPP_FLAGS = \
$(AM_CPPFLAGS) \
@@ -97,9 +97,9 @@ test_LD_ADD = \
libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @HWLOC_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@
+ @HWLOC_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@ @LIBPCRE@ @LIBCAP@
test_EventSystem_SOURCES = unit_tests/test_EventSystem.cc
test_EventSystem_CPPFLAGS = $(test_CPP_FLAGS)
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index 284eff8475..6db40ac3de 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -50,10 +50,6 @@ check_PROGRAMS = test_RefCountCache test_HostFile
test_RefCountCache_SOURCES = \
test_RefCountCache.cc
-#test_UNUSED_SOURCES = \
-# test_I_HostDB.cc \
-# test_P_HostDB.cc
-
test_LD_FLAGS = \
@AM_LDFLAGS@ \
@SWOC_LDFLAGS@ @OPENSSL_LDFLAGS@ @YAMLCPP_LDFLAGS@
@@ -70,9 +66,9 @@ test_CPP_FLAGS = \
test_LD_ADD = \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@
+ @SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@ @OPENSSL_LIBS@ @LIBPCRE@
@LIBCAP@
test_RefCountCache_CPPFLAGS = $(test_CPP_FLAGS)
diff --git a/iocore/io_uring/Makefile.am b/iocore/io_uring/Makefile.am
index 492dfca560..6430cdac83 100644
--- a/iocore/io_uring/Makefile.am
+++ b/iocore/io_uring/Makefile.am
@@ -42,7 +42,7 @@ test_CPP_FLAGS = \
-I$(abs_top_srcdir)/lib/catch2
test_LD_ADD = \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/iocore/io_uring/libinkuring.a \
@HWLOC_LIBS@
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
index cb2206e571..edc95af842 100644
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@ -52,11 +52,13 @@ test_certlookup_SOURCES = \
test_certlookup_LDADD = \
@OPENSSL_LIBS@ \
- $(top_builddir)/src/tscore/libtscore.la
$(top_builddir)/src/tscpp/util/libtscpputil.la \
+ $(top_builddir)/src/tscore/libtscore.a
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/proxy/ParentSelectionStrategy.o \
@YAMLCPP_LIBS@ \
- @SWOC_LIBS@
+ @SWOC_LIBS@ \
+ @LIBPCRE@ \
+ @LIBCAP@
test_UDPNet_CPPFLAGS = \
$(AM_CPPFLAGS) \
@@ -65,23 +67,26 @@ test_UDPNet_CPPFLAGS = \
-I$(abs_top_srcdir)/proxy/hdrs \
-I$(abs_top_srcdir)/proxy/http \
@OPENSSL_INCLUDES@ \
- @SWOC_INCLUDES@
+ @SWOC_INCLUDES@ \
+ @LIBPCRE@
+
test_UDPNet_LDFLAGS = \
@AM_LDFLAGS@ \
@OPENSSL_LDFLAGS@ \
@YAMLCPP_LDFLAGS@ \
- @SWOC_LDFLAGS@
+ @SWOC_LDFLAGS@ \
+ @LIBPCRE@
+
test_UDPNet_LDADD = \
libinknet.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
- $(top_builddir)/src/tscore/libtscore.la
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/proxy/hdrs/libhdrs.a \
+ $(top_builddir)/src/tscore/libtscore.a
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/proxy/ParentSelectionStrategy.o \
- @HWLOC_LIBS@ @OPENSSL_LIBS@ @LIBPCRE@ @YAMLCPP_LIBS@ @SWOC_LIBS@
-
+ @HWLOC_LIBS@ @OPENSSL_LIBS@ @LIBPCRE@ @YAMLCPP_LIBS@ @SWOC_LIBS@
@LIBPCRE@ @LIBCAP@
if ENABLE_QUIC
test_UDPNet_LDADD += \
$(top_builddir)/iocore/net/quic/libquic.a
@@ -119,10 +124,10 @@ test_libinknet_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/proxy/hdrs/libhdrs.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/proxy/ParentSelectionStrategy.o \
- @HWLOC_LIBS@ @OPENSSL_LIBS@ @LIBPCRE@ @YAMLCPP_LIBS@ @SWOC_LIBS@
+ @HWLOC_LIBS@ @OPENSSL_LIBS@ @LIBPCRE@ @YAMLCPP_LIBS@ @SWOC_LIBS@
@LIBCAP@
if ENABLE_QUIC
test_libinknet_LDADD += \
diff --git a/iocore/net/quic/Makefile.am b/iocore/net/quic/Makefile.am
index a6e965aef2..aeb98a391c 100644
--- a/iocore/net/quic/Makefile.am
+++ b/iocore/net/quic/Makefile.am
@@ -60,7 +60,7 @@ test_MTHashTable_CPPFLAGS = \
test_MTHashTable_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
@SWOC_LIBS@ @OPENSSL_LIBS@
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index 0d0eab92f2..ffc93f16cf 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -26,7 +26,7 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/proxy \
-I$(abs_top_srcdir)/proxy/http \
-I$(abs_top_srcdir)/proxy/hdrs \
- @SWOC_INCLUDES@ \
+ @SWOC_INCLUDES@ \
@YAMLCPP_INCLUDES@ \
$(TS_INCLUDES)
diff --git a/mgmt/config/Makefile.am b/mgmt/config/Makefile.am
index 758408dcb2..529fb133a7 100644
--- a/mgmt/config/Makefile.am
+++ b/mgmt/config/Makefile.am
@@ -20,17 +20,17 @@
AM_CPPFLAGS += \
- $(iocore_include_dirs) \
- -I$(abs_top_srcdir)/iocore/utils \
- -I$(abs_top_srcdir)/include \
- -I$(abs_top_srcdir)/lib/ \
- -I$(abs_top_srcdir)/mgmt/rpc \
- -I$(abs_top_srcdir)/mgmt/ \
- -I$(abs_top_srcdir)/proxy/ \
- -I$(abs_top_srcdir)/proxy/http \
- -I$(abs_top_srcdir)/proxy/hdrs \
- $(TS_INCLUDES) @SWOC_INCLUDES@ \
- @YAMLCPP_INCLUDES@
+ $(iocore_include_dirs) \
+ -I$(abs_top_srcdir)/iocore/utils \
+ -I$(abs_top_srcdir)/include \
+ -I$(abs_top_srcdir)/lib/ \
+ -I$(abs_top_srcdir)/mgmt/rpc \
+ -I$(abs_top_srcdir)/mgmt/ \
+ -I$(abs_top_srcdir)/proxy/ \
+ -I$(abs_top_srcdir)/proxy/http \
+ -I$(abs_top_srcdir)/proxy/hdrs \
+ $(TS_INCLUDES) @SWOC_INCLUDES@ \
+ @YAMLCPP_INCLUDES@
# ^^ all the proxy is to include the PluginCallbacks.
@@ -51,7 +51,7 @@ libconfigmanager_la_SOURCES = \
$(libconfigmanager_COMMON)
libconfigmanager_la_LIBADD = \
- $(top_builddir)/src/tscore/libtscore.la
+ $(top_builddir)/src/tscore/libtscore.a
include $(top_srcdir)/mk/tidy.mk
diff --git a/mgmt/rpc/Makefile.am b/mgmt/rpc/Makefile.am
index cd96470db6..4bbc13621f 100644
--- a/mgmt/rpc/Makefile.am
+++ b/mgmt/rpc/Makefile.am
@@ -63,11 +63,11 @@ test_jsonrpc_SOURCES = \
test_jsonrpc_LDADD = \
libjsonrpc_protocol.la \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
- $(top_builddir)/src/tscore/libtscore.la \
- @YAMLCPP_LIBS@ @HWLOC_LIBS@
+ $(top_builddir)/src/tscore/libtscore.a \
+ @YAMLCPP_LIBS@ @HWLOC_LIBS@ @LIBPCRE@ @LIBCAP@
@@ -103,12 +103,12 @@ test_jsonrpcserver_SOURCES = \
test_jsonrpcserver_LDADD = \
libjsonrpc_protocol.la \
libjsonrpc_server.la \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- $(top_builddir)/src/tscore/libtscore.la \
- @YAMLCPP_LIBS@ @HWLOC_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@
+ $(top_builddir)/src/tscore/libtscore.a \
+ @YAMLCPP_LIBS@ @HWLOC_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@ @LIBPCRE@
@LIBCAP@
###########################################################################################
diff --git a/plugins/cache_promote/Makefile.inc
b/plugins/cache_promote/Makefile.inc
index 7c330c361e..434dcb3dff 100644
--- a/plugins/cache_promote/Makefile.inc
+++ b/plugins/cache_promote/Makefile.inc
@@ -17,8 +17,8 @@
pkglib_LTLIBRARIES += cache_promote/cache_promote.la
cache_promote_cache_promote_la_SOURCES = \
- cache_promote/cache_promote.cc \
- cache_promote/configs.cc \
- cache_promote/policy.cc \
- cache_promote/lru_policy.cc \
- cache_promote/policy_manager.cc
+ cache_promote/cache_promote.cc \
+ cache_promote/configs.cc \
+ cache_promote/policy.cc \
+ cache_promote/lru_policy.cc \
+ cache_promote/policy_manager.cc
diff --git a/plugins/cache_range_requests/Makefile.inc
b/plugins/cache_range_requests/Makefile.inc
index b1a39fb846..be97c02b14 100644
--- a/plugins/cache_range_requests/Makefile.inc
+++ b/plugins/cache_range_requests/Makefile.inc
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += cache_range_requests/cache_range_requests.la
cache_range_requests_cache_range_requests_la_SOURCES = \
- cache_range_requests/cache_range_requests.cc
+ cache_range_requests/cache_range_requests.cc
diff --git a/plugins/cachekey/Makefile.inc b/plugins/cachekey/Makefile.inc
index e0da967d67..306ad0a88e 100644
--- a/plugins/cachekey/Makefile.inc
+++ b/plugins/cachekey/Makefile.inc
@@ -16,8 +16,8 @@
pkglib_LTLIBRARIES += cachekey/cachekey.la
cachekey_cachekey_la_SOURCES = \
- cachekey/cachekey.cc \
- cachekey/common.cc \
- cachekey/configs.cc \
- cachekey/pattern.cc \
- cachekey/plugin.cc
+ cachekey/cachekey.cc \
+ cachekey/common.cc \
+ cachekey/configs.cc \
+ cachekey/pattern.cc \
+ cachekey/plugin.cc
diff --git a/plugins/experimental/access_control/Makefile.inc
b/plugins/experimental/access_control/Makefile.inc
index c61c0480cc..1a819fea1f 100644
--- a/plugins/experimental/access_control/Makefile.inc
+++ b/plugins/experimental/access_control/Makefile.inc
@@ -17,18 +17,18 @@
pkglib_LTLIBRARIES += experimental/access_control/access_control.la
experimental_access_control_access_control_la_SOURCES = \
- experimental/access_control/access_control.cc \
- experimental/access_control/common.cc \
- experimental/access_control/config.cc \
- experimental/access_control/headers.cc \
- experimental/access_control/pattern.cc \
- experimental/access_control/plugin.cc \
- experimental/access_control/utils.cc
+ experimental/access_control/access_control.cc \
+ experimental/access_control/common.cc \
+ experimental/access_control/config.cc \
+ experimental/access_control/headers.cc \
+ experimental/access_control/pattern.cc \
+ experimental/access_control/plugin.cc \
+ experimental/access_control/utils.cc
check_PROGRAMS += experimental/access_control/test_access_control
experimental_access_control_test_access_control_CPPFLAGS = $(AM_CPPFLAGS)
-I$(abs_top_srcdir)/lib/catch2 -DACCESS_CONTROL_UNIT_TEST
-experimental_access_control_test_access_control_LDADD = $(OPENSSL_LIBS)
$(top_builddir)/src/tscore/libtscore.la
+experimental_access_control_test_access_control_LDADD = $(OPENSSL_LIBS)
$(top_builddir)/src/tscore/libtscore.a
experimental_access_control_test_access_control_SOURCES = \
experimental/access_control/unit_tests/test_access_control.cc \
diff --git a/plugins/experimental/cache_key_genid/Makefile.inc
b/plugins/experimental/cache_key_genid/Makefile.inc
index 3e24cb47f0..b3a34b3537 100644
--- a/plugins/experimental/cache_key_genid/Makefile.inc
+++ b/plugins/experimental/cache_key_genid/Makefile.inc
@@ -17,7 +17,7 @@
pkglib_LTLIBRARIES += experimental/cache_key_genid/cache_key_genid.la
experimental_cache_key_genid_cache_key_genid_la_SOURCES = \
- experimental/cache_key_genid/cache_key_genid.c
+ experimental/cache_key_genid/cache_key_genid.c
experimental_cache_key_genid_cache_key_genid_la_LDFLAGS = \
$(AM_LDFLAGS) $(LIB_KYOTOCABINET)
diff --git a/plugins/experimental/collapsed_forwarding/Makefile.inc
b/plugins/experimental/collapsed_forwarding/Makefile.inc
index 3326b9397c..a54547887f 100644
--- a/plugins/experimental/collapsed_forwarding/Makefile.inc
+++ b/plugins/experimental/collapsed_forwarding/Makefile.inc
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += experimental/collapsed_forwarding/collapsed_forwarding.la
experimental_collapsed_forwarding_collapsed_forwarding_la_SOURCES = \
- experimental/collapsed_forwarding/collapsed_forwarding.cc
+ experimental/collapsed_forwarding/collapsed_forwarding.cc
diff --git a/plugins/experimental/custom_redirect/Makefile.inc
b/plugins/experimental/custom_redirect/Makefile.inc
index a0518de3d1..294d315e3e 100644
--- a/plugins/experimental/custom_redirect/Makefile.inc
+++ b/plugins/experimental/custom_redirect/Makefile.inc
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += experimental/custom_redirect/custom_redirect.la
experimental_custom_redirect_custom_redirect_la_SOURCES = \
- experimental/custom_redirect/custom_redirect.cc
+ experimental/custom_redirect/custom_redirect.cc
diff --git a/plugins/experimental/fq_pacing/Makefile.inc
b/plugins/experimental/fq_pacing/Makefile.inc
index 8da2803c1e..00e5b45569 100644
--- a/plugins/experimental/fq_pacing/Makefile.inc
+++ b/plugins/experimental/fq_pacing/Makefile.inc
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += experimental/fq_pacing/fq_pacing.la
experimental_fq_pacing_fq_pacing_la_SOURCES = \
- experimental/fq_pacing/fq_pacing.c
\ No newline at end of file
+ experimental/fq_pacing/fq_pacing.c
diff --git a/plugins/experimental/geoip_acl/Makefile.inc
b/plugins/experimental/geoip_acl/Makefile.inc
index 150b3c3bf1..288c07ad7a 100644
--- a/plugins/experimental/geoip_acl/Makefile.inc
+++ b/plugins/experimental/geoip_acl/Makefile.inc
@@ -17,7 +17,7 @@
pkglib_LTLIBRARIES += experimental/geoip_acl/geoip_acl.la
experimental_geoip_acl_geoip_acl_la_SOURCES = \
- experimental/geoip_acl/acl.cc \
- experimental/geoip_acl/geoip_acl.cc
+ experimental/geoip_acl/acl.cc \
+ experimental/geoip_acl/geoip_acl.cc
experimental_geoip_acl_geoip_acl_la_LIBADD = $(GEOIP_LIBS)
diff --git a/plugins/experimental/header_freq/Makefile.inc
b/plugins/experimental/header_freq/Makefile.inc
index b26ce4f9ee..d44c51c976 100644
--- a/plugins/experimental/header_freq/Makefile.inc
+++ b/plugins/experimental/header_freq/Makefile.inc
@@ -16,4 +16,4 @@
pkglib_LTLIBRARIES += experimental/header_freq/header_freq.la
experimental_header_freq_header_freq_la_SOURCES = \
- experimental/header_freq/header_freq.cc
+ experimental/header_freq/header_freq.cc
diff --git a/plugins/experimental/hook-trace/Makefile.inc
b/plugins/experimental/hook-trace/Makefile.inc
index 2eb0e938d5..10a3dea642 100644
--- a/plugins/experimental/hook-trace/Makefile.inc
+++ b/plugins/experimental/hook-trace/Makefile.inc
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += experimental/hook-trace/hook-trace.la
experimental_hook_trace_hook_trace_la_SOURCES = \
- experimental/hook-trace/hook-trace.cc
+ experimental/hook-trace/hook-trace.cc
diff --git a/plugins/experimental/http_stats/Makefile.inc
b/plugins/experimental/http_stats/Makefile.inc
index eae099a893..1d788716af 100644
--- a/plugins/experimental/http_stats/Makefile.inc
+++ b/plugins/experimental/http_stats/Makefile.inc
@@ -1,4 +1,4 @@
-# Licensed to the Apache Software Foundation (ASF) under one
+ # 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
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += experimental/http_stats/http_stats.la
experimental_http_stats_http_stats_la_SOURCES = \
- experimental/http_stats/http_stats.cc
+ experimental/http_stats/http_stats.cc
diff --git a/plugins/experimental/icap/Makefile.inc
b/plugins/experimental/icap/Makefile.inc
index c8cb7c5483..fa565f8911 100644
--- a/plugins/experimental/icap/Makefile.inc
+++ b/plugins/experimental/icap/Makefile.inc
@@ -17,5 +17,4 @@
pkglib_LTLIBRARIES += experimental/icap/icap.la
experimental_icap_icap_la_SOURCES = \
- experimental/icap/icap_plugin.cc
-
+ experimental/icap/icap_plugin.cc
diff --git a/plugins/experimental/inliner/Makefile.inc
b/plugins/experimental/inliner/Makefile.inc
index 18d409f5e3..d85b2b1ef0 100644
--- a/plugins/experimental/inliner/Makefile.inc
+++ b/plugins/experimental/inliner/Makefile.inc
@@ -20,10 +20,10 @@ experimental_inliner_inliner_la_CPPFLAGS = $(AM_CPPFLAGS)
-DPLUGIN_TAG=\"inliner
pkglib_LTLIBRARIES += experimental/inliner/inliner.la
experimental_inliner_inliner_la_SOURCES = \
- experimental/inliner/ats-inliner.cc \
- experimental/inliner/cache.cc \
- experimental/inliner/chunk-decoder.cc \
- experimental/inliner/fetcher.cc \
- experimental/inliner/html-parser.cc \
- experimental/inliner/inliner-handler.cc \
- experimental/inliner/ts.cc
+ experimental/inliner/ats-inliner.cc \
+ experimental/inliner/cache.cc \
+ experimental/inliner/chunk-decoder.cc \
+ experimental/inliner/fetcher.cc \
+ experimental/inliner/html-parser.cc \
+ experimental/inliner/inliner-handler.cc \
+ experimental/inliner/ts.cc
diff --git a/plugins/experimental/magick/Makefile.inc
b/plugins/experimental/magick/Makefile.inc
index b28b723396..b4381fc0b7 100644
--- a/plugins/experimental/magick/Makefile.inc
+++ b/plugins/experimental/magick/Makefile.inc
@@ -21,12 +21,12 @@ experimental_magick_magick_la_CXXFLAGS = $(AM_CXXFLAGS)
-Wno-unused-variable
pkglib_LTLIBRARIES += experimental/magick/magick.la
experimental_magick_magick_la_SOURCES = \
- experimental/magick/magick.cc
+ experimental/magick/magick.cc
experimental_magick_magick_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -L$(top_builddir)/src/tscpp/api
+ $(AM_LDFLAGS) \
+ -L$(top_builddir)/src/tscpp/api
experimental_magick_magick_la_LIBADD = \
- -ltscppapi \
- $(LIBMAGICKCPP_LIBS)
+ -ltscppapi \
+ $(LIBMAGICKCPP_LIBS)
diff --git a/plugins/experimental/maxmind_acl/Makefile.inc
b/plugins/experimental/maxmind_acl/Makefile.inc
index 5a613b5f77..25514ff9e0 100644
--- a/plugins/experimental/maxmind_acl/Makefile.inc
+++ b/plugins/experimental/maxmind_acl/Makefile.inc
@@ -17,12 +17,12 @@
pkglib_LTLIBRARIES += experimental/maxmind_acl/maxmind_acl.la
experimental_maxmind_acl_maxmind_acl_la_SOURCES = \
- experimental/maxmind_acl/maxmind_acl.cc \
- experimental/maxmind_acl/mmdb.cc
+ experimental/maxmind_acl/maxmind_acl.cc \
+ experimental/maxmind_acl/mmdb.cc
experimental_maxmind_acl_maxmind_acl_la_LIBADD = $(MAXMINDDB_LIBS)
experimental_maxmind_acl_maxmind_acl_la_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(AM_LDFLAGS)
AM_CPPFLAGS += @YAMLCPP_INCLUDES@
diff --git a/plugins/experimental/memcache/Makefile.inc
b/plugins/experimental/memcache/Makefile.inc
index 0581525b3a..b4ce07d9b0 100644
--- a/plugins/experimental/memcache/Makefile.inc
+++ b/plugins/experimental/memcache/Makefile.inc
@@ -15,17 +15,17 @@
# limitations under the License.
experimental_memcache_tsmemcache_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(abs_top_srcdir)/proxy \
- -I$(abs_top_srcdir)/iocore/aio \
- -I$(abs_top_srcdir)/iocore/cache \
- -I$(abs_top_srcdir)/iocore/eventsystem \
- -I$(abs_top_srcdir)/iocore/net \
- -I$(abs_top_srcdir)/iocore/utils \
- -I$(abs_top_srcdir)/include \
- -I$(abs_top_srcdir)/lib
+ $(AM_CPPFLAGS) \
+ -I$(abs_top_srcdir)/proxy \
+ -I$(abs_top_srcdir)/iocore/aio \
+ -I$(abs_top_srcdir)/iocore/cache \
+ -I$(abs_top_srcdir)/iocore/eventsystem \
+ -I$(abs_top_srcdir)/iocore/net \
+ -I$(abs_top_srcdir)/iocore/utils \
+ -I$(abs_top_srcdir)/include \
+ -I$(abs_top_srcdir)/lib
pkglib_LTLIBRARIES += experimental/memcache/tsmemcache.la
experimental_memcache_tsmemcache_la_SOURCES = \
- experimental/memcache/tsmemcache.cc
+ experimental/memcache/tsmemcache.cc
diff --git a/plugins/experimental/memory_profile/Makefile.inc
b/plugins/experimental/memory_profile/Makefile.inc
index 1c080f5239..507499688f 100644
--- a/plugins/experimental/memory_profile/Makefile.inc
+++ b/plugins/experimental/memory_profile/Makefile.inc
@@ -15,9 +15,9 @@
# limitations under the License.
experimental_memory_profile_memory_profile_la_CPPFLAGS = \
- $(AM_CPPFLAGS)
+ $(AM_CPPFLAGS)
pkglib_LTLIBRARIES += experimental/memory_profile/memory_profile.la
experimental_memory_profile_memory_profile_la_SOURCES = \
- experimental/memory_profile/memory_profile.cc
+ experimental/memory_profile/memory_profile.cc
diff --git a/plugins/experimental/metalink/Makefile.inc
b/plugins/experimental/metalink/Makefile.inc
index c6b25428d8..98227c8622 100644
--- a/plugins/experimental/metalink/Makefile.inc
+++ b/plugins/experimental/metalink/Makefile.inc
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += experimental/metalink/metalink.la
experimental_metalink_metalink_la_SOURCES = \
- experimental/metalink/metalink.cc
+ experimental/metalink/metalink.cc
diff --git a/plugins/experimental/money_trace/Makefile.inc
b/plugins/experimental/money_trace/Makefile.inc
index f86cceee7c..225f271db0 100644
--- a/plugins/experimental/money_trace/Makefile.inc
+++ b/plugins/experimental/money_trace/Makefile.inc
@@ -17,5 +17,4 @@
pkglib_LTLIBRARIES += experimental/money_trace/money_trace.la
experimental_money_trace_money_trace_la_SOURCES = \
- experimental/money_trace/money_trace.cc
-
+ experimental/money_trace/money_trace.cc
diff --git a/plugins/experimental/mp4/Makefile.inc
b/plugins/experimental/mp4/Makefile.inc
index c5a40a9b66..f6698c7068 100644
--- a/plugins/experimental/mp4/Makefile.inc
+++ b/plugins/experimental/mp4/Makefile.inc
@@ -17,7 +17,7 @@
pkglib_LTLIBRARIES += experimental/mp4/mp4.la
experimental_mp4_mp4_la_SOURCES = \
- experimental/mp4/mp4.cc \
- experimental/mp4/mp4_common.h \
- experimental/mp4/mp4_meta.cc \
- experimental/mp4/mp4_meta.h
+ experimental/mp4/mp4.cc \
+ experimental/mp4/mp4_common.h \
+ experimental/mp4/mp4_meta.cc \
+ experimental/mp4/mp4_meta.h
diff --git a/plugins/experimental/otel_tracer/Makefile.inc
b/plugins/experimental/otel_tracer/Makefile.inc
index bbcdb41074..7605b86a24 100644
--- a/plugins/experimental/otel_tracer/Makefile.inc
+++ b/plugins/experimental/otel_tracer/Makefile.inc
@@ -17,10 +17,10 @@
pkglib_LTLIBRARIES += experimental/otel_tracer/otel_tracer.la
experimental_otel_tracer_otel_tracer_la_SOURCES = \
- experimental/otel_tracer/otel_tracer.cc \
- experimental/otel_tracer/tracer_common.h
+ experimental/otel_tracer/otel_tracer.cc \
+ experimental/otel_tracer/tracer_common.h
experimental_otel_tracer_otel_tracer_la_LIBADD = $(OTEL_LIBS)
experimental_otel_tracer_otel_tracer_la_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(AM_LDFLAGS)
diff --git a/plugins/experimental/parent_select/Makefile.inc
b/plugins/experimental/parent_select/Makefile.inc
index e7428fe78f..41e1a5f1de 100644
--- a/plugins/experimental/parent_select/Makefile.inc
+++ b/plugins/experimental/parent_select/Makefile.inc
@@ -17,13 +17,13 @@
pkglib_LTLIBRARIES += experimental/parent_select/parent_select.la
experimental_parent_select_parent_select_la_SOURCES = \
- experimental/parent_select/strategy.cc \
- experimental/parent_select/healthstatus.cc \
- experimental/parent_select/consistenthash.cc \
- experimental/parent_select/consistenthash_config.cc \
- experimental/parent_select/parent_select.cc
+ experimental/parent_select/strategy.cc \
+ experimental/parent_select/healthstatus.cc \
+ experimental/parent_select/consistenthash.cc \
+ experimental/parent_select/consistenthash_config.cc \
+ experimental/parent_select/parent_select.cc
experimental_parent_select_parent_select_la_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(AM_LDFLAGS)
AM_CPPFLAGS += @YAMLCPP_INCLUDES@ $(TS_INCLUDES)
diff --git a/plugins/experimental/rate_limit/Makefile.inc
b/plugins/experimental/rate_limit/Makefile.inc
index 95ab01f43b..69fa09affe 100644
--- a/plugins/experimental/rate_limit/Makefile.inc
+++ b/plugins/experimental/rate_limit/Makefile.inc
@@ -17,9 +17,9 @@
pkglib_LTLIBRARIES += experimental/rate_limit/rate_limit.la
experimental_rate_limit_rate_limit_la_SOURCES = \
- experimental/rate_limit/rate_limit.cc \
- experimental/rate_limit/txn_limiter.cc \
- experimental/rate_limit/sni_limiter.cc \
- experimental/rate_limit/sni_selector.cc \
- experimental/rate_limit/ip_reputation.cc \
- experimental/rate_limit/utilities.cc
+ experimental/rate_limit/rate_limit.cc \
+ experimental/rate_limit/txn_limiter.cc \
+ experimental/rate_limit/sni_limiter.cc \
+ experimental/rate_limit/sni_selector.cc \
+ experimental/rate_limit/ip_reputation.cc \
+ experimental/rate_limit/utilities.cc
diff --git a/plugins/experimental/redo_cache_lookup/Makefile.inc
b/plugins/experimental/redo_cache_lookup/Makefile.inc
index 316d6dbe5a..d2831a103c 100644
--- a/plugins/experimental/redo_cache_lookup/Makefile.inc
+++ b/plugins/experimental/redo_cache_lookup/Makefile.inc
@@ -17,11 +17,10 @@
pkglib_LTLIBRARIES += experimental/redo_cache_lookup/redo_cache_lookup.la
experimental_redo_cache_lookup_redo_cache_lookup_la_SOURCES = \
- experimental/redo_cache_lookup/redo_cache_lookup.cc
+ experimental/redo_cache_lookup/redo_cache_lookup.cc
experimental_redo_cache_lookup_redo_cache_lookup_la_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(AM_LDFLAGS)
experimental_redo_cache_lookup_redo_cache_lookup_la_LIBADD = \
- $(top_builddir)/src/tscpp/api/libtscppapi.la
-
+ $(top_builddir)/src/tscpp/api/libtscppapi.la
diff --git a/plugins/experimental/remap_stats/Makefile.inc
b/plugins/experimental/remap_stats/Makefile.inc
index ce92258007..562876b7ac 100644
--- a/plugins/experimental/remap_stats/Makefile.inc
+++ b/plugins/experimental/remap_stats/Makefile.inc
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += experimental/remap_stats/remap_stats.la
experimental_remap_stats_remap_stats_la_SOURCES = \
- experimental/remap_stats/remap_stats.cc
+ experimental/remap_stats/remap_stats.cc
diff --git a/plugins/experimental/slice/Makefile.inc
b/plugins/experimental/slice/Makefile.inc
index 1cc44e5b2e..0bf4c1f0b6 100644
--- a/plugins/experimental/slice/Makefile.inc
+++ b/plugins/experimental/slice/Makefile.inc
@@ -17,39 +17,39 @@
pkglib_LTLIBRARIES += experimental/slice/slice.la
experimental_slice_slice_la_SOURCES = \
- experimental/slice/client.cc \
- experimental/slice/client.h \
- experimental/slice/Config.cc \
- experimental/slice/Config.h \
- experimental/slice/ContentRange.cc \
- experimental/slice/ContentRange.h \
- experimental/slice/Data.h \
- experimental/slice/HttpHeader.cc \
- experimental/slice/HttpHeader.h \
- experimental/slice/intercept.cc \
- experimental/slice/intercept.h \
- experimental/slice/prefetch.cc \
- experimental/slice/prefetch.h \
- experimental/slice/Range.cc \
- experimental/slice/Range.h \
- experimental/slice/response.cc \
- experimental/slice/response.h \
- experimental/slice/server.cc \
- experimental/slice/server.h \
- experimental/slice/slice.cc \
- experimental/slice/slice.h \
- experimental/slice/Stage.h \
- experimental/slice/transfer.cc \
- experimental/slice/transfer.h \
- experimental/slice/util.cc \
- experimental/slice/util.h
+ experimental/slice/client.cc \
+ experimental/slice/client.h \
+ experimental/slice/Config.cc \
+ experimental/slice/Config.h \
+ experimental/slice/ContentRange.cc \
+ experimental/slice/ContentRange.h \
+ experimental/slice/Data.h \
+ experimental/slice/HttpHeader.cc \
+ experimental/slice/HttpHeader.h \
+ experimental/slice/intercept.cc \
+ experimental/slice/intercept.h \
+ experimental/slice/prefetch.cc \
+ experimental/slice/prefetch.h \
+ experimental/slice/Range.cc \
+ experimental/slice/Range.h \
+ experimental/slice/response.cc \
+ experimental/slice/response.h \
+ experimental/slice/server.cc \
+ experimental/slice/server.h \
+ experimental/slice/slice.cc \
+ experimental/slice/slice.h \
+ experimental/slice/Stage.h \
+ experimental/slice/transfer.cc \
+ experimental/slice/transfer.h \
+ experimental/slice/util.cc \
+ experimental/slice/util.h
check_PROGRAMS += experimental/slice/test_content_range
experimental_slice_test_content_range_CPPFLAGS = $(AM_CPPFLAGS)
-I$(abs_top_srcdir)/lib/catch2 -DUNITTEST
experimental_slice_test_content_range_SOURCES = \
- experimental/slice/unit-tests/test_content_range.cc \
- experimental/slice/ContentRange.cc
+ experimental/slice/unit-tests/test_content_range.cc \
+ experimental/slice/ContentRange.cc
experimental_slice_test_content_range_LDADD = @LIBPCRE@
@@ -57,8 +57,8 @@ check_PROGRAMS += experimental/slice/test_range
experimental_slice_test_range_CPPFLAGS = $(AM_CPPFLAGS)
-I$(abs_top_srcdir)/lib/catch2 -DUNITTEST
experimental_slice_test_range_SOURCES = \
- experimental/slice/unit-tests/test_range.cc \
- experimental/slice/Range.cc
+ experimental/slice/unit-tests/test_range.cc \
+ experimental/slice/Range.cc
experimental_slice_test_range_LDADD = @LIBPCRE@
@@ -66,7 +66,7 @@ check_PROGRAMS += experimental/slice/test_config
experimental_slice_test_config_CPPFLAGS = $(AM_CPPFLAGS)
-I$(abs_top_srcdir)/lib/catch2 -DUNITTEST
experimental_slice_test_config_SOURCES = \
- experimental/slice/unit-tests/test_config.cc \
- experimental/slice/Config.cc
+ experimental/slice/unit-tests/test_config.cc \
+ experimental/slice/Config.cc
experimental_slice_test_config_LDADD = @LIBPCRE@
diff --git a/plugins/experimental/sslheaders/Makefile.inc
b/plugins/experimental/sslheaders/Makefile.inc
index a2178a7d7e..870c45fcd7 100644
--- a/plugins/experimental/sslheaders/Makefile.inc
+++ b/plugins/experimental/sslheaders/Makefile.inc
@@ -53,7 +53,7 @@ experimental_sslheaders_test_sslheaders_LDFLAGS =
@OPENSSL_LDFLAGS@
experimental_sslheaders_test_sslheaders_LDADD = \
@AM_LDFLAGS@ \
experimental/sslheaders/libsslhdr.la \
- $(abs_top_builddir)/src/tscore/libtscore.la \
+ $(abs_top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
@OPENSSL_LIBS@
diff --git a/plugins/experimental/statichit/Makefile.inc
b/plugins/experimental/statichit/Makefile.inc
index b45e5e0d3b..6e124f0980 100644
--- a/plugins/experimental/statichit/Makefile.inc
+++ b/plugins/experimental/statichit/Makefile.inc
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += experimental/statichit/statichit.la
experimental_statichit_statichit_la_SOURCES = \
- experimental/statichit/statichit.cc
+ experimental/statichit/statichit.cc
diff --git a/plugins/experimental/stek_share/Makefile.inc
b/plugins/experimental/stek_share/Makefile.inc
index 462916d337..6242e00fc8 100644
--- a/plugins/experimental/stek_share/Makefile.inc
+++ b/plugins/experimental/stek_share/Makefile.inc
@@ -18,7 +18,7 @@
pkglib_LTLIBRARIES += experimental/stek_share/stek_share.la
experimental_stek_share_stek_share_la_SOURCES = \
- experimental/stek_share/common.cc \
+ experimental/stek_share/common.cc \
experimental/stek_share/common.h \
experimental/stek_share/log_store.cc \
experimental/stek_share/log_store.h \
diff --git a/plugins/experimental/stream_editor/Makefile.inc
b/plugins/experimental/stream_editor/Makefile.inc
index 5089676d60..20edc0f5c4 100644
--- a/plugins/experimental/stream_editor/Makefile.inc
+++ b/plugins/experimental/stream_editor/Makefile.inc
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += experimental/stream_editor/stream_editor.la
experimental_stream_editor_stream_editor_la_SOURCES = \
- experimental/stream_editor/stream_editor.cc
+ experimental/stream_editor/stream_editor.cc
diff --git a/plugins/experimental/tls_bridge/Makefile.inc
b/plugins/experimental/tls_bridge/Makefile.inc
index e791028db4..dfb21b9c98 100644
--- a/plugins/experimental/tls_bridge/Makefile.inc
+++ b/plugins/experimental/tls_bridge/Makefile.inc
@@ -17,7 +17,6 @@
pkglib_LTLIBRARIES += experimental/tls_bridge/tls_bridge.la
experimental_tls_bridge_tls_bridge_la_SOURCES = \
- experimental/tls_bridge/tls_bridge.cc \
- experimental/tls_bridge/regex.h \
- experimental/tls_bridge/regex.cc
-
+ experimental/tls_bridge/tls_bridge.cc \
+ experimental/tls_bridge/regex.h \
+ experimental/tls_bridge/regex.cc
diff --git a/plugins/experimental/uri_signing/Makefile.inc
b/plugins/experimental/uri_signing/Makefile.inc
index 8bba1987f1..4a44445eb0 100644
--- a/plugins/experimental/uri_signing/Makefile.inc
+++ b/plugins/experimental/uri_signing/Makefile.inc
@@ -17,28 +17,28 @@
pkglib_LTLIBRARIES += experimental/uri_signing/uri_signing.la
experimental_uri_signing_uri_signing_la_SOURCES = \
- experimental/uri_signing/uri_signing.c \
- experimental/uri_signing/config.c \
- experimental/uri_signing/cookie.c \
- experimental/uri_signing/jwt.c \
- experimental/uri_signing/match.c \
- experimental/uri_signing/parse.c \
- experimental/uri_signing/normalize.c \
- experimental/uri_signing/timing.c
+ experimental/uri_signing/uri_signing.c \
+ experimental/uri_signing/config.c \
+ experimental/uri_signing/cookie.c \
+ experimental/uri_signing/jwt.c \
+ experimental/uri_signing/match.c \
+ experimental/uri_signing/parse.c \
+ experimental/uri_signing/normalize.c \
+ experimental/uri_signing/timing.c
experimental_uri_signing_uri_signing_la_LIBADD = @LIBJANSSON@ @LIBCJOSE@
@LIBPCRE@ -lm -lcrypto
check_PROGRAMS += experimental/uri_signing/test_uri_signing
experimental_uri_signing_test_uri_signing_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(abs_top_srcdir)/lib/catch2 \
- -DURI_SIGNING_UNIT_TEST \
- -DSRCDIR=\"$(srcdir)\"
+ $(AM_CPPFLAGS) \
+ -I$(abs_top_srcdir)/lib/catch2 \
+ -DURI_SIGNING_UNIT_TEST \
+ -DSRCDIR=\"$(srcdir)\"
experimental_uri_signing_test_uri_signing_LDADD = @LIBJANSSON@ @LIBCJOSE@
@LIBPCRE@ -lm -lcrypto
experimental_uri_signing_test_uri_signing_SOURCES = \
- experimental/uri_signing/unit_tests/uri_signing_test.cc \
+ experimental/uri_signing/unit_tests/uri_signing_test.cc \
experimental/uri_signing/jwt.c \
experimental/uri_signing/common.c \
experimental/uri_signing/parse.c \
diff --git a/plugins/experimental/wasm/Makefile.inc
b/plugins/experimental/wasm/Makefile.inc
index 9a183d6d16..ebd92050c5 100755
--- a/plugins/experimental/wasm/Makefile.inc
+++ b/plugins/experimental/wasm/Makefile.inc
@@ -41,48 +41,47 @@ endif
pkglib_LTLIBRARIES += experimental/wasm/wasm.la
experimental_wasm_wasm_la_SOURCES = \
- experimental/wasm/lib/src/bytecode_util.cc \
- experimental/wasm/lib/include/proxy-wasm/bytecode_util.h \
- experimental/wasm/lib/src/context.cc \
- experimental/wasm/lib/include/proxy-wasm/context.h \
- experimental/wasm/lib/include/proxy-wasm/context_interface.h \
- experimental/wasm/lib/src/exports.cc \
- experimental/wasm/lib/include/proxy-wasm/exports.h \
- experimental/wasm/lib/include/proxy-wasm/limits.h \
- experimental/wasm/lib/include/proxy-wasm/proxy_wasm_common.h \
- experimental/wasm/lib/include/proxy-wasm/proxy_wasm_enums.h \
- experimental/wasm/lib/src/shared_data.cc \
- experimental/wasm/lib/include/proxy-wasm/shared_data.h \
- experimental/wasm/lib/src/shared_queue.cc \
- experimental/wasm/lib/include/proxy-wasm/shared_queue.h \
- experimental/wasm/lib/src/signature_util.cc \
- experimental/wasm/lib/include/proxy-wasm/signature_util.h \
- experimental/wasm/lib/src/vm_id_handle.cc \
- experimental/wasm/lib/include/proxy-wasm/vm_id_handle.h \
- experimental/wasm/lib/src/pairs_util.cc \
- experimental/wasm/lib/include/proxy-wasm/pairs_util.h \
- experimental/wasm/lib/include/proxy-wasm/wasm_vm.h \
- experimental/wasm/lib/src/wasm.cc \
- experimental/wasm/lib/include/proxy-wasm/wasm.h \
- experimental/wasm/ats_wasm.cc \
- experimental/wasm/ats_wasm.h \
- experimental/wasm/ats_context.cc \
- experimental/wasm/ats_context.h \
- experimental/wasm/wasm_main.cc \
- experimental/wasm/lib/src/common/types.h \
- experimental/wasm/lib/include/proxy-wasm/word.h
+ experimental/wasm/lib/src/bytecode_util.cc \
+ experimental/wasm/lib/include/proxy-wasm/bytecode_util.h \
+ experimental/wasm/lib/src/context.cc \
+ experimental/wasm/lib/include/proxy-wasm/context.h \
+ experimental/wasm/lib/include/proxy-wasm/context_interface.h \
+ experimental/wasm/lib/src/exports.cc \
+ experimental/wasm/lib/include/proxy-wasm/exports.h \
+ experimental/wasm/lib/include/proxy-wasm/limits.h \
+ experimental/wasm/lib/include/proxy-wasm/proxy_wasm_common.h \
+ experimental/wasm/lib/include/proxy-wasm/proxy_wasm_enums.h \
+ experimental/wasm/lib/src/shared_data.cc \
+ experimental/wasm/lib/include/proxy-wasm/shared_data.h \
+ experimental/wasm/lib/src/shared_queue.cc \
+ experimental/wasm/lib/include/proxy-wasm/shared_queue.h \
+ experimental/wasm/lib/src/signature_util.cc \
+ experimental/wasm/lib/include/proxy-wasm/signature_util.h \
+ experimental/wasm/lib/src/vm_id_handle.cc \
+ experimental/wasm/lib/include/proxy-wasm/vm_id_handle.h \
+ experimental/wasm/lib/src/pairs_util.cc \
+ experimental/wasm/lib/include/proxy-wasm/pairs_util.h \
+ experimental/wasm/lib/include/proxy-wasm/wasm_vm.h \
+ experimental/wasm/lib/src/wasm.cc \
+ experimental/wasm/lib/include/proxy-wasm/wasm.h \
+ experimental/wasm/ats_wasm.cc \
+ experimental/wasm/ats_wasm.h \
+ experimental/wasm/ats_context.cc \
+ experimental/wasm/ats_context.h \
+ experimental/wasm/wasm_main.cc \
+ experimental/wasm/lib/src/common/types.h \
+ experimental/wasm/lib/include/proxy-wasm/word.h
if HAS_WASMEDGE
experimental_wasm_wasm_la_SOURCES += \
- experimental/wasm/lib/src/wasmedge/wasmedge.cc \
- experimetnal/wasm/lib/src/wasmedge/types.h \
- experimental/wasm/lib/include/proxy-wasm/wasmedge.h
+ experimental/wasm/lib/src/wasmedge/wasmedge.cc \
+ experimetnal/wasm/lib/src/wasmedge/types.h \
+ experimental/wasm/lib/include/proxy-wasm/wasmedge.h
endif
if HAS_WAMR
experimental_wasm_wasm_la_SOURCES += \
- experimental/wasm/lib/src/wamr/wamr.cc \
- experimetnal/wasm/lib/src/wamr/types.h \
- experimental/wasm/lib/include/proxy-wasm/wamr.h
+ experimental/wasm/lib/src/wamr/wamr.cc \
+ experimetnal/wasm/lib/src/wamr/types.h \
+ experimental/wasm/lib/include/proxy-wasm/wamr.h
endif
-
diff --git a/plugins/experimental/webp_transform/Makefile.inc
b/plugins/experimental/webp_transform/Makefile.inc
index a7423bcbf7..a2ac4f0ab0 100644
--- a/plugins/experimental/webp_transform/Makefile.inc
+++ b/plugins/experimental/webp_transform/Makefile.inc
@@ -21,12 +21,12 @@ experimental_webp_transform_webp_transform_la_CXXFLAGS =
$(AM_CXXFLAGS)
pkglib_LTLIBRARIES += experimental/webp_transform/webp_transform.la
experimental_webp_transform_webp_transform_la_SOURCES = \
- experimental/webp_transform/ImageTransform.cc
+ experimental/webp_transform/ImageTransform.cc
experimental_webp_transform_webp_transform_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -L$(top_builddir)/src/tscpp/api
+ $(AM_LDFLAGS) \
+ -L$(top_builddir)/src/tscpp/api
experimental_webp_transform_webp_transform_la_LIBADD = \
- -ltscppapi \
- $(LIBMAGICKCPP_LIBS)
+ -ltscppapi \
+ $(LIBMAGICKCPP_LIBS)
diff --git a/plugins/lua/Makefile.inc b/plugins/lua/Makefile.inc
index d68faa8984..aaeb0c22a0 100644
--- a/plugins/lua/Makefile.inc
+++ b/plugins/lua/Makefile.inc
@@ -20,31 +20,31 @@ lua_tslua_la_LDFLAGS = $(AM_LDFLAGS) $(LUAJIT_LDFLAGS)
pkglib_LTLIBRARIES += lua/tslua.la
lua_tslua_la_SOURCES = \
- lua/ts_lua.c \
- lua/ts_lua_cached_response.c \
- lua/ts_lua_client_request.c \
- lua/ts_lua_client_response.c \
- lua/ts_lua_context.c \
- lua/ts_lua_hook.c \
- lua/ts_lua_http.c \
- lua/ts_lua_http_intercept.c \
- lua/ts_lua_log.c \
- lua/ts_lua_misc.c \
- lua/ts_lua_server_request.c \
- lua/ts_lua_server_response.c \
- lua/ts_lua_transform.c \
- lua/ts_lua_util.c \
- lua/ts_lua_remap.c \
- lua/ts_lua_http_cntl.c \
- lua/ts_lua_http_milestone.c \
- lua/ts_lua_http_txn_info.c \
- lua/ts_lua_http_config.c \
- lua/ts_lua_mgmt.c \
- lua/ts_lua_package.c \
- lua/ts_lua_string.c \
- lua/ts_lua_crypto.c \
- lua/ts_lua_stat.c \
- lua/ts_lua_io.c \
- lua/ts_lua_coroutine.c \
- lua/ts_lua_fetch.c \
- lua/ts_lua_constant.c
+ lua/ts_lua.c \
+ lua/ts_lua_cached_response.c \
+ lua/ts_lua_client_request.c \
+ lua/ts_lua_client_response.c \
+ lua/ts_lua_context.c \
+ lua/ts_lua_hook.c \
+ lua/ts_lua_http.c \
+ lua/ts_lua_http_intercept.c \
+ lua/ts_lua_log.c \
+ lua/ts_lua_misc.c \
+ lua/ts_lua_server_request.c \
+ lua/ts_lua_server_response.c \
+ lua/ts_lua_transform.c \
+ lua/ts_lua_util.c \
+ lua/ts_lua_remap.c \
+ lua/ts_lua_http_cntl.c \
+ lua/ts_lua_http_milestone.c \
+ lua/ts_lua_http_txn_info.c \
+ lua/ts_lua_http_config.c \
+ lua/ts_lua_mgmt.c \
+ lua/ts_lua_package.c \
+ lua/ts_lua_string.c \
+ lua/ts_lua_crypto.c \
+ lua/ts_lua_stat.c \
+ lua/ts_lua_io.c \
+ lua/ts_lua_coroutine.c \
+ lua/ts_lua_fetch.c \
+ lua/ts_lua_constant.c
diff --git a/plugins/multiplexer/Makefile.inc b/plugins/multiplexer/Makefile.inc
index 7c6975f2b2..11f1a4c11c 100644
--- a/plugins/multiplexer/Makefile.inc
+++ b/plugins/multiplexer/Makefile.inc
@@ -19,10 +19,10 @@ multiplexer_multiplexer_la_CPPFLAGS = $(AM_CPPFLAGS)
-DPLUGIN_TAG=\"multiplexer\
pkglib_LTLIBRARIES += multiplexer/multiplexer.la
multiplexer_multiplexer_la_SOURCES = \
- multiplexer/ats-multiplexer.cc \
- multiplexer/chunk-decoder.cc \
- multiplexer/dispatch.cc \
- multiplexer/fetcher.cc \
- multiplexer/original-request.cc \
- multiplexer/post.cc \
- multiplexer/ts.cc
+ multiplexer/ats-multiplexer.cc \
+ multiplexer/chunk-decoder.cc \
+ multiplexer/dispatch.cc \
+ multiplexer/fetcher.cc \
+ multiplexer/original-request.cc \
+ multiplexer/post.cc \
+ multiplexer/ts.cc
diff --git a/plugins/prefetch/Makefile.inc b/plugins/prefetch/Makefile.inc
index 7b98ac1706..5968be80c0 100644
--- a/plugins/prefetch/Makefile.inc
+++ b/plugins/prefetch/Makefile.inc
@@ -16,16 +16,16 @@
pkglib_LTLIBRARIES += prefetch/prefetch.la
prefetch_prefetch_la_SOURCES = \
- prefetch/plugin.cc \
- prefetch/common.cc \
- prefetch/configs.cc \
- prefetch/fetch.cc \
- prefetch/headers.cc \
- prefetch/pattern.cc \
- prefetch/fetch_policy.cc \
- prefetch/fetch_policy_simple.cc \
- prefetch/fetch_policy_lru.cc \
- prefetch/evaluate.cc
+ prefetch/plugin.cc \
+ prefetch/common.cc \
+ prefetch/configs.cc \
+ prefetch/fetch.cc \
+ prefetch/headers.cc \
+ prefetch/pattern.cc \
+ prefetch/fetch_policy.cc \
+ prefetch/fetch_policy_simple.cc \
+ prefetch/fetch_policy_lru.cc \
+ prefetch/evaluate.cc
check_PROGRAMS += prefetch/test_evaluate
diff --git a/plugins/remap_purge/Makefile.inc b/plugins/remap_purge/Makefile.inc
index 951722152b..72db237f20 100644
--- a/plugins/remap_purge/Makefile.inc
+++ b/plugins/remap_purge/Makefile.inc
@@ -17,4 +17,4 @@
pkglib_LTLIBRARIES += remap_purge/remap_purge.la
remap_purge_remap_purge_la_SOURCES = \
- remap_purge/remap_purge.c
+ remap_purge/remap_purge.c
diff --git a/plugins/server_push_preload/Makefile.inc
b/plugins/server_push_preload/Makefile.inc
index 518d71c7fb..948738a296 100644
--- a/plugins/server_push_preload/Makefile.inc
+++ b/plugins/server_push_preload/Makefile.inc
@@ -17,11 +17,10 @@
pkglib_LTLIBRARIES += server_push_preload/server_push_preload.la
server_push_preload_server_push_preload_la_SOURCES = \
- server_push_preload/server_push_preload.cc
+ server_push_preload/server_push_preload.cc
server_push_preload_server_push_preload_la_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(AM_LDFLAGS)
server_push_preload_server_push_preload_la_LIBADD = \
- $(top_builddir)/src/tscpp/api/libtscppapi.la
-
+ $(top_builddir)/src/tscpp/api/libtscppapi.la
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
index 1f1940cdfb..935209a88b 100644
--- a/proxy/hdrs/Makefile.am
+++ b/proxy/hdrs/Makefile.am
@@ -58,10 +58,11 @@ load_http_hdr_SOURCES = \
MIME.h \
load_http_hdr.cc
-load_http_hdr_LDADD = -L. -lhdrs \
- @SWOC_LIBS@ \
- $(top_builddir)/src/tscore/libtscore.la \
- $(top_builddir)/src/tscpp/util/libtscpputil.la
+load_http_hdr_LDADD =
+ $(top_builddir)/proxy/hdrs/libhdrs.a \
+ $(top_builddir)/src/tscore/libtscore.a \
+ $(top_builddir)/src/tscpp/util/libtscpputil.la \
+ @SWOC_LIBS@
check_PROGRAMS = \
test_proxy_hdrs \
@@ -82,14 +83,13 @@ test_proxy_hdrs_SOURCES = \
unit_tests/test_mime.cc
test_proxy_hdrs_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
- -L. -lhdrs \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/proxy/hdrs/libhdrs.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
+ $(top_builddir)/src/tscore/libtscore.a \
@SWOC_LIBS@ @HWLOC_LIBS@ \
- @LIBCAP@
+ @LIBPCRE@ @OPENSSL_LIBS@ @LIBCAP@
test_hdr_heap_CPPFLAGS = $(AM_CPPFLAGS) \
-I$(abs_top_srcdir)/lib/catch2
@@ -98,18 +98,17 @@ test_hdr_heap_SOURCES = \
unit_tests/unit_test_main.cc \
unit_tests/test_HdrHeap.cc
-test_hdr_heap_LDADD = -L. -lhdrs \
- $(top_builddir)/src/tscore/libtscore.la \
- -L. -lhdrs \
- $(top_builddir)/src/tscore/libtscore.la \
- $(top_builddir)/src/tscpp/util/libtscpputil.la \
+test_hdr_heap_LDADD = \
+ $(top_builddir)/proxy/hdrs/libhdrs.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
+ $(top_builddir)/src/tscore/libtscore.a \
+ $(top_builddir)/src/tscpp/util/libtscpputil.la \
@SWOC_LIBS@ @HWLOC_LIBS@ \
- @LIBCAP@
+ @LIBPCRE@ @OPENSSL_LIBS@ @LIBCAP@
test_Huffmancode_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la
test_Huffmancode_SOURCES = \
@@ -122,8 +121,9 @@ test_XPACK_CPPFLAGS = \
-I$(abs_top_srcdir)/lib/catch2
test_XPACK_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
- $(top_builddir)/src/tscpp/util/libtscpputil.la
+ $(top_builddir)/src/tscore/libtscore.a \
+ $(top_builddir)/src/tscpp/util/libtscpputil.la \
+ @LIBPCRE@ @LIBCAP@
test_XPACK_SOURCES = \
unit_tests/test_XPACK.cc \
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index 3afb3d4ddc..84d4d8e515 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -105,23 +105,27 @@ test_proxy_http_SOURCES = \
HttpBodyFactory.h
test_proxy_http_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
$(top_builddir)/proxy/hdrs/libhdrs.a \
$(top_builddir)/proxy/logging/liblogging.a \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/iocore/utils/libinkutils.a \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
@SWOC_LIBS@ @HWLOC_LIBS@ \
@LIBCAP@ \
- @YAMLCPP_LIBS@
+ @YAMLCPP_LIBS@ \
+ @LIBPCRE@ \
+ @OPENSSL_LIBS@
test_PreWarm_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(abs_top_srcdir)/lib/catch2
+test_PreWarm_LDFLAGS = $(AM_LDFLAGS) @YAMLCPP_LDFLAGS@
+
test_PreWarm_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
@YAMLCPP_LIBS@
test_PreWarm_SOURCES = \
@@ -150,14 +154,14 @@ test_HttpTransact_LDADD = \
$(top_builddir)/iocore/cache/libinkcache.a \
$(top_builddir)/lib/fastlz/libfastlz.a \
$(top_builddir)/iocore/aio/libinkaio.a \
- $(top_builddir)/src/tscore/libtscore.la \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/proxy/libproxy.a \
$(top_builddir)/iocore/net/libinknet.a \
$(top_builddir)/src/records/librecords_p.a \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
-lz -llzma -lcrypto -lresolv -lssl \
- @LIBPCRE@ @HWLOC_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@
+ @LIBPCRE@ @HWLOC_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@ @LIBCAP@
if ENABLE_QUIC
test_HttpTransact_LDADD += \
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index 96a3d13f7c..5353ab914a 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -47,8 +47,8 @@ libhttp_remap_a_SOURCES = \
NextHopStrategyFactory.cc \
RemapConfig.cc \
RemapConfig.h \
- RemapHitCount.cc \
- RemapHitCount.h \
+ RemapHitCount.cc \
+ RemapHitCount.h \
RemapPluginInfo.cc \
RemapPluginInfo.h \
PluginDso.cc \
@@ -66,13 +66,12 @@ libhttp_remap_a_SOURCES = \
UrlRewrite.h
COMMON_PLUGINDSO_LDADDS = \
- $(OPENSSL_LIBS) \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @SWOC_LIBS@ @HWLOC_LIBS@
+ @SWOC_LIBS@ @HWLOC_LIBS@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBCAP@
clang-tidy-local: $(libhttp_remap_a_SOURCES)
$(CXX_Clang_Tidy)
@@ -135,18 +134,21 @@ test_NextHopStrategyFactory_CPPFLAGS = \
@YAMLCPP_INCLUDES@
test_NextHopStrategyFactory_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
$(top_builddir)/proxy/hdrs/libhdrs.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
- $(top_builddir)/proxy/logging/liblogging.a \
$(top_builddir)/iocore/utils/libinkutils.a \
+ $(top_builddir)/src/tscore/libtscore.a \
+ $(top_builddir)/proxy/logging/liblogging.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @SWOC_LIBS@ \
- @YAMLCPP_LIBS@ \
- @HWLOC_LIBS@
+ @SWOC_LIBS@ \
+ @YAMLCPP_LIBS@ \
+ @HWLOC_LIBS@ \
+ @LIBPCRE@ \
+ @OPENSSL_LIBS@ \
+ @LIBCAP@
-test_NextHopStrategyFactory_LDFLAGS = $(AM_LDFLAGS)
-L$(top_builddir)/src/tscore/.libs -ltscore
+test_NextHopStrategyFactory_LDFLAGS = $(AM_LDFLAGS)
-L$(top_builddir)/src/tscore -ltscore
test_NextHopStrategyFactory_SOURCES = \
NextHopSelectionStrategy.cc \
@@ -166,18 +168,21 @@ test_NextHopRoundRobin_CPPFLAGS = \
@YAMLCPP_INCLUDES@
test_NextHopRoundRobin_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
$(top_builddir)/proxy/hdrs/libhdrs.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/proxy/logging/liblogging.a \
$(top_builddir)/iocore/utils/libinkutils.a \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @SWOC_LIBS@ \
- @YAMLCPP_LIBS@ \
- @HWLOC_LIBS@
+ @SWOC_LIBS@ \
+ @YAMLCPP_LIBS@ \
+ @HWLOC_LIBS@ \
+ @LIBPCRE@ \
+ @OPENSSL_LIBS@ \
+ @LIBCAP@
-test_NextHopRoundRobin_LDFLAGS = $(AM_LDFLAGS)
-L$(top_builddir)/src/tscore/.libs -ltscore
-L$(top_builddir)/src/tscpp/util/.libs -ltscpputil
+test_NextHopRoundRobin_LDFLAGS = $(AM_LDFLAGS) -L$(top_builddir)/src/tscore
-ltscore -L$(top_builddir)/src/tscpp/util/.libs -ltscpputil
test_NextHopRoundRobin_SOURCES = \
unit-tests/test_NextHopRoundRobin.cc \
@@ -197,18 +202,21 @@ test_NextHopConsistentHash_CPPFLAGS = \
@YAMLCPP_INCLUDES@
test_NextHopConsistentHash_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
$(top_builddir)/proxy/hdrs/libhdrs.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/proxy/logging/liblogging.a \
$(top_builddir)/iocore/utils/libinkutils.a \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @SWOC_LIBS@ \
- @YAMLCPP_LIBS@ \
- @HWLOC_LIBS@
+ @SWOC_LIBS@ \
+ @YAMLCPP_LIBS@ \
+ @HWLOC_LIBS@ \
+ @LIBPCRE@ \
+ @OPENSSL_LIBS@ \
+ @LIBCAP@
-test_NextHopConsistentHash_LDFLAGS = $(AM_LDFLAGS)
-L$(top_builddir)/src/tscore/.libs -ltscore
+test_NextHopConsistentHash_LDFLAGS = $(AM_LDFLAGS)
-L$(top_builddir)/src/tscore -ltscore
test_NextHopConsistentHash_SOURCES = \
NextHopSelectionStrategy.cc \
diff --git a/proxy/http2/Makefile.am b/proxy/http2/Makefile.am
index 1d0d7ddbfd..02ed791f32 100644
--- a/proxy/http2/Makefile.am
+++ b/proxy/http2/Makefile.am
@@ -73,11 +73,11 @@ test_libhttp2_LDADD = \
HPACK.o \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/src/tscore/libtscore.la \
$(top_builddir)/proxy/hdrs/libhdrs.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @SWOC_LIBS@ @HWLOC_LIBS@
+ @SWOC_LIBS@ @HWLOC_LIBS@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBCAP@
if OS_LINUX
test_libhttp2_LDFLAGS = $(AM_LDFLAGS)\
@@ -86,7 +86,6 @@ else
test_libhttp2_LDFLAGS = $(AM_LDFLAGS)\
-Wl,-undefined -Wl,suppress -Wl,-flat_namespace -Wl,-dead_strip
endif
-
test_libhttp2_CPPFLAGS = $(AM_CPPFLAGS)\
-I$(abs_top_srcdir)/lib/catch2
@@ -97,7 +96,7 @@ test_libhttp2_SOURCES = \
unit_tests/main.cc
test_Http2DependencyTree_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
@SWOC_LIBS@
@@ -110,9 +109,11 @@ test_Http2DependencyTree_SOURCES = \
test_Http2FrequencyCounter_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @SWOC_LIBS@
+ @SWOC_LIBS@ \
+ @LIBPCRE@ \
+ @LIBCAP@
test_Http2FrequencyCounter_CPPFLAGS = $(AM_CPPFLAGS)\
-I$(abs_top_srcdir)/lib/catch2
@@ -124,11 +125,11 @@ test_Http2FrequencyCounter_SOURCES = \
test_HPACK_LDADD = \
$(top_builddir)/proxy/hdrs/libhdrs.a \
- $(top_builddir)/src/tscore/libtscore.la \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
- @SWOC_LIBS@ @HWLOC_LIBS@
+ $(top_builddir)/src/tscore/libtscore.a \
+ @SWOC_LIBS@ @HWLOC_LIBS@ @LIBPCRE@ @OPENSSL_LIBS@ @YAMLCPP_LIBS@
@LIBCAP@
test_HPACK_SOURCES = \
test_HPACK.cc \
diff --git a/proxy/http3/Makefile.am b/proxy/http3/Makefile.am
index 45b2c2c40d..e853679e7c 100644
--- a/proxy/http3/Makefile.am
+++ b/proxy/http3/Makefile.am
@@ -72,7 +72,7 @@ test_LDADD = \
$(top_builddir)/iocore/net/TLSKeyLogger.o \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/proxy/hdrs/libhdrs.a \
@LIBPCRE@ \
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index cf3252da41..82c9693ff3 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -80,10 +80,10 @@ test_LogUtils_SOURCES = \
unit-tests/test_LogUtils.cc
test_LogUtils_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- @SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@
+ @SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@ @LIBPCRE@ @LIBCAP@
test_RolledLogDeleter_CPPFLAGS = \
$(AM_CPPFLAGS) \
@@ -96,10 +96,10 @@ test_RolledLogDeleter_SOURCES = \
unit-tests/test_RolledLogDeleter.cc
test_RolledLogDeleter_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- @SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@
+ @SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@ @LIBPCRE@ @LIBCAP@
clang-tidy-local: $(liblogging_a_SOURCES) $(EXTRA_DIST)
$(CXX_Clang_Tidy)
diff --git a/src/records/Makefile.am b/src/records/Makefile.am
index dbea41ecc2..c2188a73bd 100644
--- a/src/records/Makefile.am
+++ b/src/records/Makefile.am
@@ -71,8 +71,8 @@ test_librecords_LDADD = \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- $(top_builddir)/src/tscore/libtscore.la \
- @SWOC_LIBS@ @HWLOC_LIBS@ @LIBCAP@ @YAMLCPP_LIBS@
+ $(top_builddir)/src/tscore/libtscore.a \
+ @SWOC_LIBS@ @HWLOC_LIBS@ @LIBCAP@ @YAMLCPP_LIBS@ @LIBPCRE@
@OPENSSL_LIBS@
test_librecords_on_eventsystem_CPPFLAGS = $(AM_CPPFLAGS)\
-I$(abs_top_srcdir)/lib/catch2
@@ -85,8 +85,8 @@ test_librecords_on_eventsystem_LDADD = \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- $(top_builddir)/src/tscore/libtscore.la \
- @HWLOC_LIBS@ @LIBCAP@ @YAMLCPP_LIBS@ @SWOC_LIBS@
+ $(top_builddir)/src/tscore/libtscore.a \
+ @HWLOC_LIBS@ @LIBCAP@ @YAMLCPP_LIBS@ @SWOC_LIBS@ @LIBPCRE@
@OPENSSL_LIBS@
clang-tidy-local: $(sort $(DIST_SOURCES))
$(CXX_Clang_Tidy)
diff --git a/src/traffic_cache_tool/Makefile.inc
b/src/traffic_cache_tool/Makefile.inc
index 42e653a8a0..c48d46941c 100644
--- a/src/traffic_cache_tool/Makefile.inc
+++ b/src/traffic_cache_tool/Makefile.inc
@@ -36,23 +36,6 @@ traffic_cache_tool_traffic_cache_tool_SOURCES = \
traffic_cache_tool_traffic_cache_tool_LDFLAGS = $(AM_LDFLAGS) @SWOC_LDFLAGS@
traffic_cache_tool_traffic_cache_tool_LDADD = \
- $(top_builddir)/src/tscore/.libs/ArgParser.o \
- $(top_builddir)/src/tscore/.libs/ink_assert.o \
- $(top_builddir)/src/tscore/.libs/ink_error.o \
- $(top_builddir)/src/tscore/.libs/ink_file.o \
- $(top_builddir)/src/tscore/.libs/ink_memory.o \
- $(top_builddir)/src/tscore/.libs/ink_mutex.o \
- $(top_builddir)/src/tscore/.libs/ink_string.o \
- $(top_builddir)/src/tscore/.libs/BufferWriterFormat.o \
- $(top_builddir)/src/tscore/.libs/InkErrno.o \
- $(top_builddir)/src/tscore/.libs/Errata.o \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/.libs/TextView.o \
- $(top_builddir)/src/tscore/.libs/Regex.o \
- $(top_builddir)/src/tscore/.libs/CryptoHash.o \
- $(top_builddir)/src/tscore/.libs/MMH.o \
- $(top_builddir)/src/tscore/.libs/Version.o \
- $(top_builddir)/src/tscore/.libs/Regression.o \
- $(top_builddir)/src/tscore/.libs/ink_args.o \
- $(top_builddir)/src/tscore/.libs/ParseRules.o \
- $(top_builddir)/src/tscore/.libs/SourceLocation.o \
@SWOC_LIBS@ @OPENSSL_LIBS@ @LIBPCRE@
diff --git a/src/traffic_crashlog/Makefile.inc
b/src/traffic_crashlog/Makefile.inc
index 18e3b20159..f7c69fe6d8 100644
--- a/src/traffic_crashlog/Makefile.inc
+++ b/src/traffic_crashlog/Makefile.inc
@@ -39,6 +39,6 @@ traffic_crashlog_traffic_crashlog_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/net/libinknet.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @HWLOC_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@
+ @HWLOC_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@ @LIBPCRE@ @LIBCAP@
diff --git a/src/traffic_ctl/Makefile.inc b/src/traffic_ctl/Makefile.inc
index 0a09ca1a89..7962769e55 100644
--- a/src/traffic_ctl/Makefile.inc
+++ b/src/traffic_ctl/Makefile.inc
@@ -30,9 +30,15 @@ traffic_ctl_traffic_ctl_SOURCES = \
traffic_ctl/traffic_ctl.cc \
traffic_ctl/CtrlPrinters.cc \
traffic_ctl/CtrlCommands.cc \
- traffic_ctl/FileConfigCommand.cc \
+ traffic_ctl/FileConfigCommand.cc \
shared/rpc/IPCSocketClient.cc
+traffic_ctl_traffic_ctl_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ @SWOC_LDFLAGS@ \
+ @YAMLCPP_LDFLAGS@
+
+
traffic_ctl_traffic_ctl_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
- @HWLOC_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@
+ $(top_builddir)/src/tscore/libtscore.a \
+ @HWLOC_LIBS@ @OPENSSL_LIBS@ @SWOC_LIBS@ @YAMLCPP_LIBS@ @LIBCAP@
diff --git a/src/traffic_layout/Makefile.inc b/src/traffic_layout/Makefile.inc
index 233d145461..6f7409c9d0 100644
--- a/src/traffic_layout/Makefile.inc
+++ b/src/traffic_layout/Makefile.inc
@@ -43,6 +43,6 @@ traffic_layout_traffic_layout_SOURCES = \
traffic_layout_traffic_layout_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
- @SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@ @LIBLZMA@
+ @SWOC_LIBS@ @HWLOC_LIBS@ @YAMLCPP_LIBS@ @LIBLZMA@ @LIBPCRE@ @LIBCAP@
diff --git a/src/traffic_logcat/Makefile.inc b/src/traffic_logcat/Makefile.inc
index c085cf8048..44677d66f3 100644
--- a/src/traffic_logcat/Makefile.inc
+++ b/src/traffic_logcat/Makefile.inc
@@ -20,7 +20,7 @@
bin_PROGRAMS += traffic_logcat/traffic_logcat
traffic_logcat_traffic_logcat_CPPFLAGS = \
- $(AM_CPPFLAGS) \
+ $(AM_CPPFLAGS) \
$(iocore_include_dirs) \
-I$(abs_top_srcdir)/include \
-I$(abs_top_srcdir)/lib \
@@ -32,7 +32,7 @@ traffic_logcat_traffic_logcat_CPPFLAGS = \
traffic_logcat_traffic_logcat_LDFLAGS = \
$(AM_LDFLAGS) \
- @YAMLCPP_LDFLAGS@
+ @SWOC_LDFLAGS@ @YAMLCPP_LDFLAGS@
traffic_logcat_traffic_logcat_SOURCES = \
traffic_logcat/logcat.cc
@@ -44,10 +44,8 @@ traffic_logcat_traffic_logcat_LDADD = \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/iocore/utils/libinkutils.a \
- $(top_builddir)/src/tscore/libtscore.la \
- $(top_builddir)/src/tscpp/util/libtscpputil.la
-
-traffic_logcat_traffic_logcat_LDADD += \
+ $(top_builddir)/src/tscore/libtscore.a \
+ $(top_builddir)/src/tscpp/util/libtscpputil.la \
@SWOC_LIBS@ @HWLOC_LIBS@ \
- @YAMLCPP_LIBS@ \
+ @YAMLCPP_LIBS@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBCAP@ \
@LIBPROFILER@ -lm
diff --git a/src/traffic_logstats/Makefile.inc
b/src/traffic_logstats/Makefile.inc
index 16aebb459e..3afd3960d8 100644
--- a/src/traffic_logstats/Makefile.inc
+++ b/src/traffic_logstats/Makefile.inc
@@ -20,7 +20,7 @@
bin_PROGRAMS += traffic_logstats/traffic_logstats
traffic_logstats_traffic_logstats_CPPFLAGS = \
- $(AM_CPPFLAGS) \
+ $(AM_CPPFLAGS) \
$(iocore_include_dirs) \
-I$(abs_top_srcdir)/include \
-I$(abs_top_srcdir)/lib \
@@ -40,7 +40,7 @@ TESTS += \
traffic_logstats/tests/test_logstats_summary
traffic_logstats_traffic_logstats_SOURCES = \
- traffic_logstats/logstats.cc
+ traffic_logstats/logstats.cc
traffic_logstats_traffic_logstats_LDADD = \
$(top_builddir)/proxy/logging/liblogging.a \
@@ -49,11 +49,12 @@ traffic_logstats_traffic_logstats_LDADD = \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/iocore/utils/libinkutils.a \
- $(top_builddir)/src/tscore/libtscore.la \
- $(top_builddir)/src/tscpp/util/libtscpputil.la
-
-traffic_logstats_traffic_logstats_LDADD += \
- @SWOC_LIBS@ \
- @HWLOC_LIBS@ \
- @YAMLCPP_LIBS@ \
- @LIBPROFILER@ -lm
+ $(top_builddir)/src/tscore/libtscore.a \
+ $(top_builddir)/src/tscpp/util/libtscpputil.la \
+ @SWOC_LIBS@ \
+ @HWLOC_LIBS@ \
+ @OPENSSL_LIBS@ \
+ @LIBPCRE@ \
+ @YAMLCPP_LIBS@ \
+ @LIBCAP@ \
+ @LIBPROFILER@ -lm
diff --git a/src/traffic_quic/Makefile.inc b/src/traffic_quic/Makefile.inc
index 70f523ad9a..d2688455e7 100644
--- a/src/traffic_quic/Makefile.inc
+++ b/src/traffic_quic/Makefile.inc
@@ -49,7 +49,7 @@ traffic_quic_traffic_quic_LDADD = \
$(top_builddir)/iocore/net/quic/libquic.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
$(top_builddir)/src/records/librecords_p.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/proxy/ParentSelectionStrategy.o \
$(top_builddir)/proxy/http3/libhttp3.a \
diff --git a/src/traffic_server/Makefile.inc b/src/traffic_server/Makefile.inc
index 2c33b899db..136c1a52aa 100644
--- a/src/traffic_server/Makefile.inc
+++ b/src/traffic_server/Makefile.inc
@@ -40,7 +40,7 @@ traffic_server_traffic_server_CPPFLAGS = \
traffic_server_traffic_server_LDFLAGS = \
$(AM_LDFLAGS) \
- @SWOC_LDFLAGS@ \
+ @SWOC_LDFLAGS@ \
@YAMLCPP_LDFLAGS@
traffic_server_traffic_server_SOURCES = \
@@ -78,12 +78,12 @@ traffic_server_traffic_server_LDADD = \
$(top_builddir)/iocore/cache/libinkcache.a \
$(top_builddir)/lib/fastlz/libfastlz.a \
$(top_builddir)/iocore/aio/libinkaio.a \
- $(top_builddir)/src/tscore/libtscore.la \
- $(top_builddir)/src/tscpp/util/libtscpputil.la \
$(top_builddir)/proxy/libproxy.a \
$(top_builddir)/iocore/net/libinknet.a \
$(top_builddir)/src/records/librecords_p.a \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
+ $(top_builddir)/src/tscore/libtscore.a \
+ $(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 \
@@ -98,6 +98,7 @@ traffic_server_traffic_server_LDADD = \
@OPENSSL_LIBS@ \
@YAMLCPP_LIBS@ \
@URING_LIBS@ \
+ @LIBCAP@ \
-lm
if IS_DARWIN
@@ -108,13 +109,13 @@ endif
if ENABLE_QUIC
traffic_server_traffic_server_LDADD += \
- $(top_builddir)/proxy/http3/libhttp3.a \
- $(top_builddir)/iocore/net/quic/libquic.a \
- $(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(QUICHE_LIB)
+ $(top_builddir)/proxy/http3/libhttp3.a \
+ $(top_builddir)/iocore/net/quic/libquic.a \
+ $(top_builddir)/iocore/eventsystem/libinkevent.a \
+ $(QUICHE_LIB)
endif
if ENABLE_IO_URING
traffic_server_traffic_server_LDADD += \
- $(top_builddir)/iocore/io_uring/libinkuring.a
+ $(top_builddir)/iocore/io_uring/libinkuring.a
endif
diff --git a/src/traffic_top/Makefile.inc b/src/traffic_top/Makefile.inc
index b9eca9b59a..7e96f05f65 100644
--- a/src/traffic_top/Makefile.inc
+++ b/src/traffic_top/Makefile.inc
@@ -24,7 +24,7 @@ traffic_top_traffic_top_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(abs_top_srcdir)/include \
$(TS_INCLUDES) \
- @SWOC_INCLUDES@ \
+ @SWOC_INCLUDES@ \
@CURL_CFLAGS@ \
@CURSES_CFLAGS@ \
@YAMLCPP_INCLUDES@
@@ -42,10 +42,11 @@ traffic_top_traffic_top_SOURCES = \
traffic_top_traffic_top_LDADD = \
$(top_builddir)/iocore/eventsystem/libinkevent.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
@CURL_LIBS@ \
@CURSES_LIBS@ \
@HWLOC_LIBS@ \
+ @OPENSSL_LIBS@ \
@SWOC_LIBS@ @YAMLCPP_LIBS@
endif
diff --git a/src/traffic_via/Makefile.inc b/src/traffic_via/Makefile.inc
index 51a0997d08..7205d24e42 100644
--- a/src/traffic_via/Makefile.inc
+++ b/src/traffic_via/Makefile.inc
@@ -20,20 +20,20 @@
bin_PROGRAMS += traffic_via/traffic_via
traffic_via_traffic_via_CPPFLAGS = \
- $(AM_CPPFLAGS) \
+ $(AM_CPPFLAGS) \
$(iocore_include_dirs) \
-I$(abs_top_srcdir)/include \
$(TS_INCLUDES)
traffic_via_traffic_via_LDFLAGS = \
- $(AM_LDFLAGS) \
+ $(AM_LDFLAGS) \
@OPENSSL_LDFLAGS@
traffic_via_traffic_via_SOURCES = \
traffic_via/traffic_via.cc
traffic_via_traffic_via_LDADD = \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
@LIBPCRE@
diff --git a/src/traffic_wccp/Makefile.inc b/src/traffic_wccp/Makefile.inc
index 5b946bb8e4..1e2150c478 100644
--- a/src/traffic_wccp/Makefile.inc
+++ b/src/traffic_wccp/Makefile.inc
@@ -20,22 +20,22 @@
bin_PROGRAMS += traffic_wccp/traffic_wccp
traffic_wccp_traffic_wccp_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- $(iocore_include_dirs) \
- -I$(abs_top_srcdir)/include \
- -I$(abs_top_srcdir)/lib \
- $(TS_INCLUDES) \
- @OPENSSL_INCLUDES@
+ $(AM_CPPFLAGS) \
+ $(iocore_include_dirs) \
+ -I$(abs_top_srcdir)/include \
+ -I$(abs_top_srcdir)/lib \
+ $(TS_INCLUDES) \
+ @OPENSSL_INCLUDES@
traffic_wccp_traffic_wccp_LDFLAGS = \
- $(AM_LDFLAGS) \
- @OPENSSL_LDFLAGS@
+ $(AM_LDFLAGS) \
+ @OPENSSL_LDFLAGS@
traffic_wccp_traffic_wccp_SOURCES = \
traffic_wccp/wccp_client.cc
traffic_wccp_traffic_wccp_LDADD = \
$(top_builddir)/src/wccp/libwccp.a \
- $(top_builddir)/src/tscore/libtscore.la \
+ $(top_builddir)/src/tscore/libtscore.a \
$(top_builddir)/src/tscpp/util/libtscpputil.la \
@OPENSSL_LIBS@
diff --git a/src/tscore/Makefile.am b/src/tscore/Makefile.am
index 74af32d6b7..b97c022729 100644
--- a/src/tscore/Makefile.am
+++ b/src/tscore/Makefile.am
@@ -31,7 +31,7 @@ BUILT_SOURCES = ParseRules.cc
TESTS = $(check_PROGRAMS)
-lib_LTLIBRARIES = libtscore.la
+noinst_LIBRARIES = libtscore.a
AM_CPPFLAGS += \
@SWOC_INCLUDES@ \
@@ -40,21 +40,7 @@ AM_CPPFLAGS += \
$(TS_INCLUDES) \
@YAMLCPP_INCLUDES@
-libtscore_la_LDFLAGS = @AM_LDFLAGS@ -no-undefined -version-info
@TS_LIBTOOL_VERSION@ @SWOC_LDFLAGS@ @YAMLCPP_LDFLAGS@
-libtscore_la_LIBADD = \
- $(top_builddir)/src/tscpp/util/libtscpputil.la \
- @SWOC_LIBS@ \
- @LIBOBJS@ \
- @LIBPCRE@ \
- @OPENSSL_LIBS@ \
- @LIBRESOLV@ \
- @LIBCAP@ \
- @HWLOC_LIBS@ \
- @YAMLCPP_LIBS@ \
- @SWOC_LIBS@ \
- -lc
-
-libtscore_la_SOURCES = \
+libtscore_a_SOURCES = \
AcidPtr.cc \
Arena.cc \
ArgParser.cc \
@@ -135,7 +121,7 @@ else
HKDF_impl = HKDF_openssl.cc
endif
endif
-libtscore_la_SOURCES += \
+libtscore_a_SOURCES += \
$(HKDF_impl)
endif
@@ -148,23 +134,25 @@ ParseRulesCType: CompileParseRules
LSAN_OPTIONS='detect_leaks=0' ./CompileParseRules
test_atomic_SOURCES = test_atomic.cc
-test_atomic_LDADD = libtscore.la
$(top_builddir)/src/tscpp/util/libtscpputil.la @LIBPCRE@
+test_atomic_LDADD = libtscore.a $(top_builddir)/src/tscpp/util/libtscpputil.la
@LIBPCRE@ @LIBCAP@
test_freelist_SOURCES = test_freelist.cc
-test_freelist_LDADD = libtscore.la
$(top_builddir)/src/tscpp/util/libtscpputil.la @SWOC_LIBS@ @LIBPCRE@
+test_freelist_LDADD = libtscore.a
$(top_builddir)/src/tscpp/util/libtscpputil.la @SWOC_LIBS@ @LIBPCRE@ @LIBCAP@
test_geometry_SOURCES = test_geometry.cc
-test_geometry_LDADD = libtscore.la
$(top_builddir)/src/tscpp/util/libtscpputil.la @SWOC_LIBS@ @LIBPCRE@ -lstdc++
+test_geometry_LDADD = libtscore.a
$(top_builddir)/src/tscpp/util/libtscpputil.la @SWOC_LIBS@ @LIBPCRE@ -lstdc++
test_X509HostnameValidator_CPPFLAGS = $(AM_CPPFLAGS)
-I$(abs_top_srcdir)/lib/catch2
-test_X509HostnameValidator_LDADD = libtscore.la
$(top_builddir)/src/tscpp/util/libtscpputil.la @SWOC_LIBS@ @LIBPCRE@
@OPENSSL_LIBS@
+test_X509HostnameValidator_LDADD = libtscore.a
$(top_builddir)/src/tscpp/util/libtscpputil.la \
+ @SWOC_LIBS@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBCAP@
test_X509HostnameValidator_SOURCES = unit_tests/test_X509HostnameValidator.cc
test_tscore_CPPFLAGS = $(AM_CPPFLAGS)\
-I$(abs_top_srcdir)/lib/catch2
test_tscore_CXXFLAGS = -Wno-array-bounds $(AM_CXXFLAGS)
-test_tscore_LDADD = libtscore.la
$(top_builddir)/src/tscpp/util/libtscpputil.la @SWOC_LIBS@ @OPENSSL_LIBS@
+test_tscore_LDADD = libtscore.a $(top_builddir)/src/tscpp/util/libtscpputil.la
\
+ @SWOC_LIBS@ @OPENSSL_LIBS@ @LIBPCRE@ @LIBCAP@
test_tscore_SOURCES = \
unit_tests/unit_test_main.cc \
unit_tests/test_AcidPtr.cc \
@@ -203,11 +191,12 @@ test_tscore_SOURCES += \
endif
freelist_benchmark_CXXFLAGS = -Wno-array-bounds $(AM_CXXFLAGS)
-I$(abs_top_srcdir)/lib/catch2
-freelist_benchmark_LDADD = libtscore.la @HWLOC_LIBS@
+freelist_benchmark_LDADD = libtscore.a @HWLOC_LIBS@ @LIBPCRE@ @LIBCAP@
freelist_benchmark_SOURCES = unit_tests/freelist_benchmark.cc
benchmark_shared_mutex_CXXFLAGS = -Wno-array-bounds $(AM_CXXFLAGS)
-I$(abs_top_srcdir)/lib/catch2
-benchmark_shared_mutex_LDADD = libtscore.la
+benchmark_shared_mutex_LDADD = libtscore.a @LIBPCRE@ @LIBCAP@
+
benchmark_shared_mutex_SOURCES = unit_tests/benchmark_shared_mutex.cc
CompileParseRules_SOURCES = CompileParseRules.cc
diff --git a/tests/gold_tests/jsonrpc/plugins/Makefile.inc
b/tests/gold_tests/jsonrpc/plugins/Makefile.inc
index 33ab4eb057..36752cb066 100644
--- a/tests/gold_tests/jsonrpc/plugins/Makefile.inc
+++ b/tests/gold_tests/jsonrpc/plugins/Makefile.inc
@@ -18,10 +18,8 @@ noinst_LTLIBRARIES +=
gold_tests/jsonrpc/plugins/jsonrpc_plugin_handler_test.la
gold_tests_jsonrpc_plugins_jsonrpc_plugin_handler_test_la_SOURCES =
gold_tests/jsonrpc/plugins/jsonrpc_plugin_handler_test.cc
AM_CPPFLAGS += \
- -I$(abs_top_srcdir)/mgmt \
- @YAMLCPP_INCLUDES@
+ -I$(abs_top_srcdir)/mgmt \
+ @YAMLCPP_INCLUDES@
gold_tests_jsonrpc_plugins_jsonrpc_plugin_handler_test_la_LDFLAGS = \
- $(AM_LDFLAGS)
-
-
+ $(AM_LDFLAGS)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index bb6a1f4301..62054a7af3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -35,7 +35,7 @@ noinst_PROGRAMS = jtest/jtest
endif
jtest_jtest_SOURCES = jtest/jtest.cc
-jtest_jtest_LDADD = $(top_builddir)/src/tscore/libtscore.la
$(top_builddir)/src/tscpp/util/libtscpputil.la -lssl -lcrypto
+jtest_jtest_LDADD = $(top_builddir)/src/tscore/libtscore.a
$(top_builddir)/src/tscpp/util/libtscpputil.la -lssl -lcrypto
if BUILD_HTTP_LOAD
