Repository: trafficserver Updated Branches: refs/heads/master d77730387 -> 9f4ae29f1
Use automake variables consistently Use proper automake variables rather than raw linker flags. Fix the non-default OpenSSL build flags to use the correct LDFLAGS invocation. Remove @OPENSSL_LIBS@ where it is not necessary (ie. when it is implicitly added by libtool). Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9f4ae29f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9f4ae29f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9f4ae29f Branch: refs/heads/master Commit: 9f4ae29f1f67b73ac7fd56ec2e700708988a8b0b Parents: d777303 Author: James Peach <[email protected]> Authored: Fri Feb 6 11:40:27 2015 -0800 Committer: James Peach <[email protected]> Committed: Fri Feb 6 11:42:15 2015 -0800 ---------------------------------------------------------------------- cmd/traffic_cop/Makefile.am | 9 ++++--- cmd/traffic_crashlog/Makefile.am | 9 +++---- cmd/traffic_layout/Makefile.am | 5 ++++ cmd/traffic_line/Makefile.am | 8 +++++-- cmd/traffic_manager/Makefile.am | 10 ++++---- cmd/traffic_top/Makefile.am | 11 ++++++--- cmd/traffic_via/Makefile.am | 6 ++++- cmd/traffic_wccp/Makefile.am | 17 +++++++++----- configure.ac | 10 ++++---- iocore/aio/Makefile.am | 15 +++++++----- iocore/eventsystem/Makefile.am | 28 +++++++++++++--------- iocore/net/Makefile.am | 15 ++++++------ mgmt/Makefile.am | 6 ++--- mgmt/utils/Makefile.am | 12 ++++++---- mgmt/web2/WebUtils.cc | 2 +- proxy/Makefile.am | 44 ++++++++++++++--------------------- 16 files changed, 119 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/cmd/traffic_cop/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_cop/Makefile.am b/cmd/traffic_cop/Makefile.am index 9176948..46f7a31 100644 --- a/cmd/traffic_cop/Makefile.am +++ b/cmd/traffic_cop/Makefile.am @@ -25,16 +25,19 @@ AM_CPPFLAGS = $(iocore_include_dirs) \ -I$(top_srcdir)/mgmt/cluster \ -I$(top_srcdir)/mgmt/api/include +AM_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ + bin_PROGRAMS = traffic_cop traffic_cop_SOURCES = \ traffic_cop.cc -traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ - traffic_cop_LDADD = \ $(top_builddir)/mgmt/libmgmt_c.la \ $(top_builddir)/mgmt/api/libtsmgmt.la \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/lib/records/librecords_cop.a \ - @LIBRESOLV@ @OPENSSL_LIBS@ + @LIBRESOLV@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/cmd/traffic_crashlog/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_crashlog/Makefile.am b/cmd/traffic_crashlog/Makefile.am index 9a2ff96..558b801 100644 --- a/cmd/traffic_crashlog/Makefile.am +++ b/cmd/traffic_crashlog/Makefile.am @@ -18,7 +18,6 @@ bin_PROGRAMS = traffic_crashlog AM_CPPFLAGS = \ - @OPENSSL_INCLUDES@ \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ -I$(top_builddir)/lib \ @@ -28,15 +27,17 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/mgmt/api/include +AM_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ + traffic_crashlog_SOURCES = \ procinfo.cc \ traffic_crashlog.cc \ traffic_crashlog.h traffic_crashlog_LDADD = \ - @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LIBS@ \ - @OPENSSL_LDFLAGS@ \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/mgmt/libmgmt_p.la \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/cmd/traffic_layout/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_layout/Makefile.am b/cmd/traffic_layout/Makefile.am index 217a65a..571a42a 100644 --- a/cmd/traffic_layout/Makefile.am +++ b/cmd/traffic_layout/Makefile.am @@ -26,6 +26,11 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/utils +AM_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ + traffic_layout_SOURCES = \ traffic_layout.cc http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/cmd/traffic_line/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_line/Makefile.am b/cmd/traffic_line/Makefile.am index 8790d43..1181c28 100644 --- a/cmd/traffic_line/Makefile.am +++ b/cmd/traffic_line/Makefile.am @@ -23,13 +23,17 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/ts \ -I$(top_srcdir)/mgmt/api/include +AM_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ + bin_PROGRAMS = traffic_line traffic_line_SOURCES = \ traffic_line.cc -traffic_line_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_line_LDADD = \ $(top_builddir)/mgmt/api/libtsmgmt.la \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBRESOLV@ @LIBTCL@ @OPENSSL_LIBS@ + @LIBRESOLV@ @LIBTCL@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/cmd/traffic_manager/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am index 5c67e3f..1e3c856 100644 --- a/cmd/traffic_manager/Makefile.am +++ b/cmd/traffic_manager/Makefile.am @@ -33,6 +33,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_builddir)/lib +AM_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @EXPAT_LDFLAGS@ \ + @OPENSSL_LDFLAGS@ + traffic_manager_SOURCES = \ AddConfigFilesHere.cc \ traffic_manager.cc \ @@ -43,7 +49,6 @@ traffic_manager_SOURCES = \ StatXML.cc \ StatXML.h -traffic_manager_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @EXPAT_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_manager_LDADD = \ $(top_builddir)/mgmt/web2/libweb.a \ $(top_builddir)/mgmt/api/libmgmtapilocal.la \ @@ -64,6 +69,3 @@ traffic_manager_LDADD += \ $(top_builddir)/lib/wccp/libwccp.a \ $(top_builddir)/lib/tsconfig/libtsconfig.la endif - -traffic_manager_LDADD += @OPENSSL_LIBS@ - http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/cmd/traffic_top/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am index 0e4fdbc..f586bbe 100644 --- a/cmd/traffic_top/Makefile.am +++ b/cmd/traffic_top/Makefile.am @@ -20,17 +20,22 @@ if BUILD_TSTOP AM_CPPFLAGS = \ $(iocore_include_dirs) \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib/ts -I$(top_builddir)/lib/ts \ + -I$(top_srcdir)/lib \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/lib/ts \ + -I$(top_builddir)/lib/ts \ -I$(top_srcdir)/mgmt/api/include \ @CURL_CFLAGS@ +AM_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ bin_PROGRAMS = traffic_top traffic_top_SOURCES = traffic_top.cc -traffic_top_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_top_LDADD = \ $(top_builddir)/mgmt/api/libtsmgmt.la \ @CURL_LIBS@ @CURSES_LIB@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/cmd/traffic_via/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_via/Makefile.am b/cmd/traffic_via/Makefile.am index c7f0888..7aeb2e8 100644 --- a/cmd/traffic_via/Makefile.am +++ b/cmd/traffic_via/Makefile.am @@ -23,12 +23,16 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/ts \ -I$(top_srcdir)/mgmt/api/include +AM_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ + bin_PROGRAMS = traffic_via traffic_via_SOURCES = \ traffic_via.cc -traffic_via_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_via_LDADD = \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBTCL@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/cmd/traffic_wccp/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_wccp/Makefile.am b/cmd/traffic_wccp/Makefile.am index 6adec70..cc354f0 100644 --- a/cmd/traffic_wccp/Makefile.am +++ b/cmd/traffic_wccp/Makefile.am @@ -24,13 +24,18 @@ AM_CPPFLAGS = $(iocore_include_dirs) \ -I$(top_srcdir)/lib/ts \ -I$(top_srcdir)/lib/wccp -bin_PROGRAMS = traffic_wccp +AM_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ -traffic_wccp_SOURCES = wccp_client.cc +bin_PROGRAMS = traffic_wccp -traffic_wccp_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ +traffic_wccp_SOURCES = \ + wccp_client.cc -traffic_wccp_LDADD = -L$(top_builddir)/lib/tsconfig -ltsconfig \ - -L$(top_builddir)/lib/wccp -lwccp \ - -L$(top_builddir)/lib/ts -ltsutil +traffic_wccp_LDADD = \ + $(top_builddir)/lib/tsconfig/libtsconfig.la \ + $(top_builddir)/lib/wccp/libwccp.a \ + $(top_builddir)/lib/ts/libtsutil.a http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index e803e57..63071f7 100644 --- a/configure.ac +++ b/configure.ac @@ -1824,7 +1824,6 @@ iocore_include_dirs="-I\$(top_srcdir)/iocore/eventsystem \ # Testing Framework suffix generation hack TFW_PACKAGE_SUFFIX=$os_type -AC_SUBST([API_DEFS]) AC_SUBST([CC]) AC_SUBST([CFLAGS]) AC_SUBST([CXX]) @@ -1991,16 +1990,17 @@ AC_MSG_NOTICE([Build option summary: CXX: $CXX CPP: $CPP CFLAGS: $CFLAGS - SHARED_CFLAGS: $SHARED_CFLAGS CXXFLAGS: $CXXFLAGS - SHARED_CXXFLAGS: $SHARED_CXXFLAGS - SHARED_CXXLINKFLAGS:$SHARED_LINKCXXFLAGS CPPFLAGS: $CPPFLAGS LDFLAGS: $LDFLAGS + SHARED_CFLAGS: $SHARED_CFLAGS + SHARED_CXXFLAGS: $SHARED_CXXFLAGS + SHARED_CXXLINKFLAGS:$SHARED_LINKCXXFLAGS SHARED_LDFLAGS: $SHARED_LDFLAGS + OPENSSL_LDFLAGS: $OPENSSL_LDFLAGS + OPENSSL_INCLUDES: $OPENSSL_INCLUDES EXTRA_CC_LDFLAGS: $EXTRA_CC_LDFLAGS EXTRA_CXX_LDFLAGS: $EXTRA_CXX_LDFLAGS LIBTOOL_LINK_FLAGS: $LIBTOOL_LINK_FLAGS - API_DEFS: $API_DEFS ]) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/iocore/aio/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am index e875c18..e4f4748 100644 --- a/iocore/aio/Makefile.am +++ b/iocore/aio/Makefile.am @@ -34,11 +34,16 @@ libinkaio_a_SOURCES = \ Inline.cc \ P_AIO.h +test_AIO_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ + test_AIO_SOURCES = \ test_AIO.cc -test_AIO_CXXFLAGS = \ - @OPENSSL_INCLUDES@ \ +test_AIO_CPPFLAGS = \ + $(AM_CPPFLAGS) \ $(iocore_include_dirs) \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/proxy/api \ @@ -47,12 +52,10 @@ test_AIO_CXXFLAGS = \ -I$(top_srcdir)/proxy/http \ -I$(top_srcdir)/proxy/logging \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/utils + -I$(top_srcdir)/mgmt/utils \ + @OPENSSL_INCLUDES@ test_AIO_LDADD = \ - @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LIBS@ \ - @OPENSSL_LDFLAGS@ \ libinkaio.a \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/mgmt/libmgmt_p.la \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/iocore/eventsystem/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am index dca21aa..955970f 100644 --- a/iocore/eventsystem/Makefile.am +++ b/iocore/eventsystem/Makefile.am @@ -71,8 +71,13 @@ libinkevent_a_SOURCES = \ check_PROGRAMS = test_Buffer test_Event -test_CXXFLAGS = \ - @OPENSSL_INCLUDES@ \ +test_LD_FLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ + +test_CPP_FLAGS = \ + $(AM_CPPFLAGS) \ $(iocore_include_dirs) \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/proxy/api \ @@ -81,12 +86,10 @@ test_CXXFLAGS = \ -I$(top_srcdir)/proxy/http \ -I$(top_srcdir)/proxy/logging \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/utils + -I$(top_srcdir)/mgmt/utils \ + @OPENSSL_INCLUDES@ -test_LDADD = \ - @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LIBS@ \ - @OPENSSL_LDFLAGS@ \ +test_LD_ADD = \ libinkevent.a \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/mgmt/libmgmt_p.la \ @@ -109,8 +112,11 @@ test_Event_SOURCES = \ # test_I_Event.cc \ # test_P_Event.cc -test_Buffer_CXXFLAGS = $(test_CXXFLAGS) -test_Event_CXXFLAGS = $(test_CXXFLAGS) +test_Buffer_CPPFLAGS = $(test_CPP_FLAGS) +test_Event_CPPFLAGS = $(test_CPP_FLAGS) + +test_Buffer_LDFLAGS = $(test_LD_FLAGS) +test_Event_LDFLAGS = $(test_LD_FLAGS) -test_Buffer_LDADD = $(test_LDADD) -test_Event_LDADD = $(test_LDADD) +test_Buffer_LDADD = $(test_LD_ADD) +test_Event_LDADD = $(test_LD_ADD) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/iocore/net/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am index 3ec3d27..2e8405c 100644 --- a/iocore/net/Makefile.am +++ b/iocore/net/Makefile.am @@ -17,7 +17,6 @@ # limitations under the License. AM_CPPFLAGS = \ - @OPENSSL_INCLUDES@ \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib \ -I$(top_builddir)/lib \ @@ -29,24 +28,26 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/proxy/api/ts \ - -I$(top_srcdir)/proxy/http + -I$(top_srcdir)/proxy/http \ + @OPENSSL_INCLUDES@ TESTS = $(check_PROGRAMS) check_PROGRAMS = test_certlookup noinst_LIBRARIES = libinknet.a +test_certlookup_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ + test_certlookup_SOURCES = \ test_certlookup.cc \ SSLCertLookup.cc test_certlookup_LDADD = \ - @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LIBS@ \ - @OPENSSL_LDFLAGS@ \ $(top_builddir)/lib/ts/libtsutil.la \ - $(top_builddir)/iocore/eventsystem/libinkevent.a \ - @OPENSSL_LIBS@ + $(top_builddir)/iocore/eventsystem/libinkevent.a libinknet_a_SOURCES = \ Connection.cc \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/mgmt/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am index afaad15..d1b93a1 100644 --- a/mgmt/Makefile.am +++ b/mgmt/Makefile.am @@ -73,9 +73,9 @@ libmgmt_lm_la_SOURCES = \ libmgmt_lm_la_LIBADD = \ libmgmt_c.la \ - cluster/libcluster.la \ - utils/libutils_lm.la + $(top_builddir)/mgmt/cluster/libcluster.la \ + $(top_builddir)/mgmt/utils/libutils_lm.la libmgmt_p_la_LIBADD = \ libmgmt_c.la \ - utils/libutils_p.la + $(top_builddir)/mgmt/utils/libutils_p.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/mgmt/utils/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am index d9a1377..dd8c043 100644 --- a/mgmt/utils/Makefile.am +++ b/mgmt/utils/Makefile.am @@ -18,7 +18,6 @@ # limitations under the License. AM_CPPFLAGS = \ - @OPENSSL_INCLUDES@ \ -I$(top_srcdir)/iocore/utils \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/api \ @@ -28,7 +27,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib + -I$(top_srcdir)/lib \ + @OPENSSL_INCLUDES@ # header files used by other libraries EXTRA_DIST = MgmtHashTable.h MgmtSocket.h @@ -56,10 +56,12 @@ libutils_p_la_SOURCES = \ $(libutils_COMMON) \ MgmtProcessCleanup.cc +test_marshall_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ + test_marshall_SOURCES = test_marshall.cc test_marshall_LDADD = \ - @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LIBS@ \ - @OPENSSL_LDFLAGS@ \ libutils_p.la \ $(top_builddir)/lib/ts/libtsutil.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/mgmt/web2/WebUtils.cc ---------------------------------------------------------------------- diff --git a/mgmt/web2/WebUtils.cc b/mgmt/web2/WebUtils.cc index 806849c..726a4d2 100644 --- a/mgmt/web2/WebUtils.cc +++ b/mgmt/web2/WebUtils.cc @@ -37,7 +37,7 @@ * ****************************************************************************/ -#include "openssl/ssl.h" +#include <openssl/ssl.h> ssize_t socket_write(SocketInfo socketD, const char *buf, size_t nbyte) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9f4ae29f/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index d970d3e..1d8c9f9 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -34,7 +34,6 @@ TESTS = \ test_xml_parser AM_CPPFLAGS = \ - @OPENSSL_INCLUDES@ \ $(iocore_include_dirs) \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ @@ -48,7 +47,15 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib + -I$(top_builddir)/lib \ + @OPENSSL_INCLUDES@ + +# NOTE: it is safe to use AM_LDFLAGS here because we are only building executables. If we start +# building libtool archives, change these to only apply to the executables. +AM_LDFLAGS = \ + @EXTRA_CXX_LDFLAGS@ \ + @LIBTOOL_LINK_FLAGS@ \ + @OPENSSL_LDFLAGS@ noinst_HEADERS = \ ConfigParse.h \ @@ -182,21 +189,19 @@ traffic_server_SOURCES = \ Update.h if BUILD_TESTS - traffic_server_SOURCES += InkAPITest.cc \ - RegressionSM.h \ - RegressionSM.cc +traffic_server_SOURCES += \ + InkAPITest.cc \ + RegressionSM.h \ + RegressionSM.cc endif -traffic_server_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ +traffic_server_LDFLAGS = $(AM_LDFLAGS) if BUILD_STATIC_PROXY traffic_server_LDFLAGS += -all-static endif traffic_server_LDADD = \ - @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LIBS@ \ - @OPENSSL_LDFLAGS@ \ http/libhttp.a \ http2/libhttp2.a \ spdy/libspdy.a \ @@ -245,11 +250,7 @@ if BUILD_LUAJIT endif traffic_logcat_SOURCES = logcat.cc -traffic_logcat_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_logcat_LDADD = \ - @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LIBS@ \ - @OPENSSL_LDFLAGS@ \ logging/liblogging.a \ shared/libdiagsconfig.a \ shared/libUglyLogStubs.a \ @@ -258,15 +259,11 @@ traffic_logcat_LDADD = \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@\ + @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@\ @LIBEXPAT@ @LIBPROFILER@ @LIBPTHREAD@ -lm traffic_logstats_SOURCES = logstats.cc -traffic_logstats_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_logstats_LDADD = \ - @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LIBS@ \ - @OPENSSL_LDFLAGS@ \ logging/liblogging.a \ shared/libdiagsconfig.a \ shared/libUglyLogStubs.a \ @@ -275,7 +272,7 @@ traffic_logstats_LDADD = \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \ + @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@ \ @LIBEXPAT@ @LIBPROFILER@ @LIBPTHREAD@ -lm traffic_sac_SOURCES = \ @@ -307,11 +304,7 @@ traffic_sac_SOURCES = \ FetchSM.cc \ InkIOCoreAPI.cc -traffic_sac_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ traffic_sac_LDADD = \ - @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LIBS@ \ - @OPENSSL_LDFLAGS@ \ http/libhttp.a \ http2/libhttp2.a \ spdy/libspdy.a \ @@ -335,7 +328,7 @@ traffic_sac_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \ + @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@ \ @LIBEXPAT@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ @LIBPTHREAD@ -lm if BUILD_TESTS @@ -345,9 +338,6 @@ endif test_xml_parser_SOURCES = test_xml_parser.cc test_xml_parser_LDADD = \ - @LIBTOOL_LINK_FLAGS@ \ - @OPENSSL_LIBS@ \ - @OPENSSL_LDFLAGS@ \ $(top_builddir)/mgmt/libmgmt_p.la \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \
