diff --git a/cop/Makefile.am b/cop/Makefile.am index 8aaecf9fcd7..99cb508d3a3 100644 --- a/cop/Makefile.am +++ b/cop/Makefile.am @@ -35,5 +35,5 @@ traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_cop_LDADD = \ $(top_builddir)/mgmt/api/remote/libtsmgmt.la \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBICONV@ @LIBRT@ @LIBDL@ \ + @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBRT@ @LIBDL@ \ @LIBEXECINFO@ @LIBSSL@ @LIBRESOLV@ diff --git a/example/app-template/Makefile.am b/example/app-template/Makefile.am index 0f3d5207484..fb21421b486 100644 --- a/example/app-template/Makefile.am +++ b/example/app-template/Makefile.am @@ -39,7 +39,7 @@ tsapp_LDADD = \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \ @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \ - @LIBEXPAT@ @LIBDEMANGLE@ @LIBICONV@ \ + @LIBEXPAT@ @LIBDEMANGLE@ \ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ @LIBEXECINFO@ EXTRA_DIST = records.config.in diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am index a1a5f1e00d8..9b3cfa74327 100644 --- a/lib/ts/Makefile.am +++ b/lib/ts/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib lib_LTLIBRARIES = libtsutil.la libtsutil_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@ -libtsutil_la_LIBADD = @LIBOBJS@ @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBRESOLV@ @LIBRT@ @LIBICONV@ @LIBSOCKET@ @LIBNSL@ @LIBCAP@ @LIBHWLOC@ -lc +libtsutil_la_LIBADD = @LIBOBJS@ @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBRESOLV@ @LIBRT@ @LIBSOCKET@ @LIBNSL@ @LIBCAP@ @LIBHWLOC@ -lc libtsutil_la_SOURCES = \ Allocator.h \ @@ -161,24 +161,24 @@ ParseRulesCType: CompileParseRules mkdfa_SOURCES = mkdfa.c test_atomic_SOURCES = test_atomic.cc -test_atomic_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@ @LIBPCRE@ +test_atomic_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@ test_atomic_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ test_freelist_SOURCES = test_freelist.cc -test_freelist_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@ @LIBPCRE@ +test_freelist_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@ test_freelist_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ test_arena_SOURCES = test_arena.cc -test_arena_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@ @LIBPCRE@ +test_arena_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@ test_arena_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ test_List_SOURCES = test_List.cc test_Map_SOURCES = test_Map.cc -test_Map_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@ @LIBPCRE@ +test_Map_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@ test_Map_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ test_Vec_SOURCES = test_Vec.cc -test_Vec_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@ @LIBPCRE@ +test_Vec_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@ test_Vec_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ CompileParseRules_SOURCES = CompileParseRules.cc diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am index cab49df0ca9..291daafa46e 100644 --- a/mgmt/Makefile.am +++ b/mgmt/Makefile.am @@ -102,8 +102,7 @@ traffic_manager_LDADD = \ $(top_builddir)/mgmt/tools/libinksysapi.a \ $(top_builddir)/mgmt/tools/libinkconfigapi.a \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBEXPAT@ @LIBPCRE@ \ - @LIBTCL@ @LIBICONV@ \ + @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ \ -lm @LIBDL@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \ @LIBTHREAD@ @LIBRT@ @LIBEXECINFO@ @LIBCAP@ diff --git a/mgmt/api/remote/Makefile.am b/mgmt/api/remote/Makefile.am index 1febd297f8f..d48594b504a 100644 --- a/mgmt/api/remote/Makefile.am +++ b/mgmt/api/remote/Makefile.am @@ -57,4 +57,4 @@ traffic_api_cli_remote_LDADD = \ libtsmgmt.la \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \ - @LIBTCL@ @LIBRT@ @LIBDL@ @LIBSSL@ @LIBICONV@ @LIBEXECINFO@ + @LIBTCL@ @LIBRT@ @LIBDL@ @LIBSSL@ @LIBEXECINFO@ diff --git a/mgmt/cli/Makefile.am b/mgmt/cli/Makefile.am index 6f06cbdcb9a..933686b0039 100644 --- a/mgmt/cli/Makefile.am +++ b/mgmt/cli/Makefile.am @@ -80,7 +80,7 @@ traffic_shell_LDADD = \ $(top_builddir)/mgmt/utils/libutils_lm.a \ $(top_builddir)/lib/ts/libtsutil.la \ $(LIBTCL) $(LIBREADLINE) \ - @LIBDL@ -lm @LIBICONV@ @LIBEXPAT@ @LIBSSL@ \ + @LIBDL@ -lm @LIBEXPAT@ @LIBSSL@ \ @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \ @LIBRT@ @LIBEXECINFO@ @LIBPCRE@ @LIBREADLINE@ @@ -88,5 +88,5 @@ traffic_line_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_line_LDADD = \ $(top_builddir)/mgmt/api/remote/libtsmgmt.la \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBICONV@ @LIBRT@ @LIBDL@ \ + @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBRT@ @LIBDL@ \ @LIBEXECINFO@ @LIBSSL@ @LIBRESOLV@ diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 5cce0298a6e..5086929002c 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -162,7 +162,7 @@ traffic_server_LDADD = \ $(which_libts) \ @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \ @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \ - @LIBEXPAT@ @LIBDEMANGLE@ @LIBICONV@ @LIBCAP@ @LIBHWLOC@ \ + @LIBEXPAT@ @LIBDEMANGLE@ @LIBCAP@ @LIBHWLOC@ \ @LIBZ@ @LIBLZMA@ \ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ @LIBEXECINFO@ @@ -185,7 +185,7 @@ traffic_logcat_LDADD = \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \ @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \ - @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm @LIBPROFILER@ \ + @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ \ @LIBEXECINFO@ traffic_logstats_SOURCES = logstats.cc @@ -203,7 +203,7 @@ traffic_logstats_LDADD = \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \ @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \ - @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm @LIBPROFILER@ \ + @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ \ @LIBEXECINFO@ traffic_sac_SOURCES = sac.cc @@ -258,7 +258,7 @@ traffic_sac_LDADD = \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \ @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \ - @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm @LIBPROFILER@ \ + @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ \ @LIBZ@ @LIBLZMA@ @LIBEXECINFO@ if BUILD_TESTS