You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2017/08/18 00:52:09 UTC
[trafficserver] 01/02: Replace EXTRA_CXX_LDFLAGS with AM_LDFLAGS
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 12cdf27c13efb9fddded49dec3db240eaa35cc0f
Author: Jack Bates <ja...@nottheoilrig.com>
AuthorDate: Wed Feb 1 19:35:21 2017 -0700
Replace EXTRA_CXX_LDFLAGS with AM_LDFLAGS
We've never had different LDFLAGS for C and C++, so drop
EXTRA_CC_LDFLAGS and EXTRA_CXX_LDFLAGS. Just use AM_LDFLAGS.
(cherry picked from commit 5b868d56fa84f044a752adc1cc209198496a8693)
---
build/common.m4 | 2 +-
cmd/traffic_cop/Makefile.am | 4 +---
cmd/traffic_crashlog/Makefile.am | 4 +---
cmd/traffic_ctl/Makefile.am | 1 -
cmd/traffic_layout/Makefile.am | 4 +---
cmd/traffic_manager/Makefile.am | 4 +---
cmd/traffic_top/Makefile.am | 4 +---
cmd/traffic_via/Makefile.am | 4 +---
cmd/traffic_wccp/Makefile.am | 5 +----
configure.ac | 16 ++++++----------
iocore/aio/Makefile.am | 3 +--
iocore/eventsystem/Makefile.am | 3 +--
iocore/hostdb/Makefile.am | 5 +----
iocore/net/Makefile.am | 3 +--
lib/ts/Makefile.am | 8 --------
mgmt/utils/Makefile.am | 3 +--
plugins/experimental/sslheaders/Makefile.inc | 2 +-
proxy/Makefile.am | 6 +-----
proxy/hdrs/Makefile.am | 3 ---
tools/Makefile.am | 1 -
20 files changed, 21 insertions(+), 64 deletions(-)
diff --git a/build/common.m4 b/build/common.m4
index 5b5081a..0302ac4 100644
--- a/build/common.m4
+++ b/build/common.m4
@@ -143,7 +143,7 @@ dnl Adds path to variable with the '-rpath' directive.
dnl
AC_DEFUN([TS_ADDTO_RPATH], [
AC_MSG_NOTICE([adding $1 to RPATH])
- TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R$1])
+ TS_ADDTO(AM_LDFLAGS, [-R$1])
])dnl
dnl
diff --git a/cmd/traffic_cop/Makefile.am b/cmd/traffic_cop/Makefile.am
index 55d0245..b098cc9 100644
--- a/cmd/traffic_cop/Makefile.am
+++ b/cmd/traffic_cop/Makefile.am
@@ -24,9 +24,7 @@ AM_CPPFLAGS = $(iocore_include_dirs) \
-I$(abs_top_srcdir)/mgmt/cluster \
-I$(abs_top_srcdir)/mgmt/api/include
-AM_LDFLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
bin_PROGRAMS = traffic_cop
diff --git a/cmd/traffic_crashlog/Makefile.am b/cmd/traffic_crashlog/Makefile.am
index a3af37b..d167010 100644
--- a/cmd/traffic_crashlog/Makefile.am
+++ b/cmd/traffic_crashlog/Makefile.am
@@ -25,9 +25,7 @@ AM_CPPFLAGS = \
-I$(abs_top_srcdir)/mgmt/utils \
-I$(abs_top_srcdir)/mgmt/api/include
-AM_LDFLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
traffic_crashlog_SOURCES = \
diff --git a/cmd/traffic_ctl/Makefile.am b/cmd/traffic_ctl/Makefile.am
index 86e6ca1..11bdd7d 100644
--- a/cmd/traffic_ctl/Makefile.am
+++ b/cmd/traffic_ctl/Makefile.am
@@ -34,7 +34,6 @@ traffic_ctl_SOURCES = \
storage.cc \
traffic_ctl.cc
-traffic_ctl_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_ctl_LDADD = \
$(top_builddir)/mgmt/api/libtsmgmt.la \
$(top_builddir)/lib/ts/libtsutil.la \
diff --git a/cmd/traffic_layout/Makefile.am b/cmd/traffic_layout/Makefile.am
index 5b8cd72..01d1abd 100644
--- a/cmd/traffic_layout/Makefile.am
+++ b/cmd/traffic_layout/Makefile.am
@@ -24,9 +24,7 @@ AM_CPPFLAGS = \
-I$(abs_top_srcdir)/mgmt \
-I$(abs_top_srcdir)/mgmt/utils
-AM_LDFLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
traffic_layout_SOURCES = \
diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am
index d3c8ced..9ab0d2e 100644
--- a/cmd/traffic_manager/Makefile.am
+++ b/cmd/traffic_manager/Makefile.am
@@ -34,9 +34,7 @@ AM_CPPFLAGS = \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/luajit/src
-AM_LDFLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
traffic_manager_SOURCES = \
diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am
index 4b8132d..d52d01e 100644
--- a/cmd/traffic_top/Makefile.am
+++ b/cmd/traffic_top/Makefile.am
@@ -25,9 +25,7 @@ AM_CPPFLAGS = \
@CURL_CFLAGS@ \
@CURSES_CFLAGS@
-AM_LDFLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
bin_PROGRAMS = traffic_top
diff --git a/cmd/traffic_via/Makefile.am b/cmd/traffic_via/Makefile.am
index 3639359..7a6853d 100644
--- a/cmd/traffic_via/Makefile.am
+++ b/cmd/traffic_via/Makefile.am
@@ -22,9 +22,7 @@ AM_CPPFLAGS = \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/mgmt/api/include
-AM_LDFLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
bin_PROGRAMS = traffic_via
diff --git a/cmd/traffic_wccp/Makefile.am b/cmd/traffic_wccp/Makefile.am
index 5480432..9f9787c 100644
--- a/cmd/traffic_wccp/Makefile.am
+++ b/cmd/traffic_wccp/Makefile.am
@@ -17,16 +17,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
AM_CPPFLAGS = $(iocore_include_dirs) \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/records \
-I$(abs_top_srcdir)/lib/wccp \
@OPENSSL_INCLUDES@
-AM_LDFLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+AM_LDFLAGS += \
@OPENSSL_LDFLAGS@
bin_PROGRAMS = traffic_wccp
diff --git a/configure.ac b/configure.ac
index af8ba84..d13fe6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -619,19 +619,19 @@ case $host_os in
linux*)
host_os_def="linux"
defer_accept=45
- EXTRA_CXX_LDFLAGS="-rdynamic"
+ AM_LDFLAGS="-rdynamic"
;;
darwin*)
host_os_def="darwin"
;;
freebsd*)
host_os_def="freebsd"
- EXTRA_CXX_LDFLAGS="-rdynamic"
+ AM_LDFLAGS="-rdynamic"
TS_ADDTO(CPPFLAGS, [-I/usr/local/include])
;;
kfreebsd*)
host_os_def="freebsd"
- EXTRA_CXX_LDFLAGS="-rdynamic"
+ AM_LDFLAGS="-rdynamic"
TS_ADDTO(CPPFLAGS, [-I/usr/local/include])
TS_ADDTO(CPPFLAGS, [-Dkfreebsd])
;;
@@ -649,7 +649,7 @@ case $host_os in
esac
;;
*)
- EXTRA_CXX_LDFLAGS="-rdynamic"
+ AM_LDFLAGS="-rdynamic"
host_os_def=unknown
;;
esac
@@ -1916,9 +1916,7 @@ AC_SUBST([CC])
AC_SUBST([CFLAGS])
AC_SUBST([CXX])
AC_SUBST([CXXFLAGS])
-AC_SUBST([EXTRA_CC_LDFLAGS])
-AC_SUBST([EXTRA_CXX_LDFLAGS])
-AC_SUBST([LIBTOOL_LINK_FLAGS])
+AC_SUBST([AM_LDFLAGS])
AC_SUBST([iocore_include_dirs])
AC_SUBST([LDFLAGS])
AC_SUBST([SHARED_CFLAGS])
@@ -2018,7 +2016,5 @@ AC_MSG_NOTICE([Build option summary:
LUAJIT_CFLAGS: $LUAJIT_CFLAGS
LUAJIT_CPPFLAGS: $LUAJIT_CPPFLAGS
LUAJIT_LDFLAGS: $LUAJIT_LDFLAGS
- EXTRA_CC_LDFLAGS: $EXTRA_CC_LDFLAGS
- EXTRA_CXX_LDFLAGS: $EXTRA_CXX_LDFLAGS
- LIBTOOL_LINK_FLAGS: $LIBTOOL_LINK_FLAGS
+ AM@&t@_LDFLAGS: $AM_LDFLAGS
])
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index 56d111f..aa1e954 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -33,8 +33,7 @@ libinkaio_a_SOURCES = \
P_AIO.h
test_AIO_LDFLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+ @AM_LDFLAGS@ \
@OPENSSL_LDFLAGS@
test_AIO_SOURCES = \
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index 997f3fd..1196a2c 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -71,8 +71,7 @@ libinkevent_a_SOURCES = \
check_PROGRAMS = test_Buffer test_Event
test_LD_FLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+ @AM_LDFLAGS@ \
@OPENSSL_LDFLAGS@
test_CPP_FLAGS = \
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index c08e457..e00ef0b 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -47,15 +47,12 @@ check_PROGRAMS = test_RefCountCache
test_RefCountCache_SOURCES = \
test_RefCountCache.cc
-
#test_UNUSED_SOURCES = \
# test_I_HostDB.cc \
# test_P_HostDB.cc
-
test_LD_FLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+ @AM_LDFLAGS@ \
@OPENSSL_LDFLAGS@
test_CPP_FLAGS = \
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
index 87383c9..2ba2bcf 100644
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@ -36,8 +36,7 @@ check_PROGRAMS = test_certlookup
noinst_LIBRARIES = libinknet.a
test_certlookup_LDFLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+ @AM_LDFLAGS@ \
@OPENSSL_LDFLAGS@
test_certlookup_SOURCES = \
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index 8b3c968..e540cb6 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -209,38 +209,30 @@ mkdfa_SOURCES = mkdfa.c
test_atomic_SOURCES = test_atomic.cc
test_atomic_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@
-test_atomic_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_freelist_SOURCES = test_freelist.cc
test_freelist_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@
-test_freelist_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_arena_SOURCES = test_arena.cc
test_arena_LDADD = libtsutil.la @LIBTCL@ @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 @LIBTCL@ @LIBPCRE@
-test_Map_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_Vec_SOURCES = test_Vec.cc
test_Vec_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@
-test_Vec_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_geometry_SOURCES = test_geometry.cc
test_geometry_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@
-test_geometry_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_X509HostnameValidator_SOURCES = test_X509HostnameValidator.cc
test_X509HostnameValidator_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@ @OPENSSL_LIBS@
-test_X509HostnameValidator_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_MemView_SOURCES = test_MemView.cc
test_MemView_LDADD = libtsutil.la
test_tsutil_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@
-test_tsutil_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_tsutil_SOURCES = \
test_PriorityQueue.cc \
test_Ptr.cc \
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index 50babef..a9bb172 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -55,8 +55,7 @@ libutils_p_la_SOURCES = \
MgmtProcessCleanup.cc
test_marshall_LDFLAGS = \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
+ @AM_LDFLAGS@ \
@OPENSSL_LDFLAGS@
test_marshall_SOURCES = test_marshall.cc
diff --git a/plugins/experimental/sslheaders/Makefile.inc b/plugins/experimental/sslheaders/Makefile.inc
index 78448f6..2056c66 100644
--- a/plugins/experimental/sslheaders/Makefile.inc
+++ b/plugins/experimental/sslheaders/Makefile.inc
@@ -51,7 +51,7 @@ experimental_sslheaders_test_sslheaders_CPPFLAGS = \
-I$(abs_top_srcdir)/lib
experimental_sslheaders_test_sslheaders_LDFLAGS = @OPENSSL_LDFLAGS@
experimental_sslheaders_test_sslheaders_LDADD = \
- @LIBTOOL_LINK_FLAGS@ \
+ @AM_LDFLAGS@ \
experimental/sslheaders/libsslhdr.la \
$(abs_top_builddir)/lib/ts/libtsutil.la \
@OPENSSL_LIBS@
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 464ae2f..c4bd26b 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -47,10 +47,8 @@ AM_CPPFLAGS = \
# 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 = \
+AM_LDFLAGS += \
$(LUAJIT_LDFLAGS) \
- @EXTRA_CXX_LDFLAGS@ \
- @LIBTOOL_LINK_FLAGS@ \
@OPENSSL_LDFLAGS@
noinst_HEADERS = \
@@ -189,8 +187,6 @@ traffic_server_SOURCES += \
RegressionSM.cc
endif
-traffic_server_LDFLAGS = $(AM_LDFLAGS)
-
traffic_server_LDADD = \
http/libhttp.a \
http2/libhttp2.a \
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
index ee37b30..808bd18 100644
--- a/proxy/hdrs/Makefile.am
+++ b/proxy/hdrs/Makefile.am
@@ -59,7 +59,6 @@ load_http_hdr_SOURCES = \
load_http_hdr_LDADD = -L. -lhdrs \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBTCL@
-load_http_hdr_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
check_PROGRAMS = test_mime
@@ -74,8 +73,6 @@ test_mime_LDADD = -L. -lhdrs \
@HWLOC_LIBS@ \
@LIBTCL@
-test_mime_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
-
test_mime_SOURCES = test_mime.cc
#test_UNUSED_SOURCES = \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a94647e..d6223ef 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -22,7 +22,6 @@ bin_SCRIPTS = tsxs tspush
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = trafficserver.pc
-AM_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
AM_CPPFLAGS = $(iocore_include_dirs) \
-I$(abs_top_srcdir)/lib \
-I$(abs_top_srcdir)/lib/wccp
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.