Skip to content

V
varnish-cache
Unverified Commit 12bbe31f authored by Dridi Boukelmoune's avatar Dridi Boukelmoune Committed by Nils Goroll
Browse files
Options

build: Only link PCRE where it is used 

Otherwise we get it from either libvarnish or libvarnishapi.

Refs #3559
parent c3661062
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
bin/varnishtest/Makefile.am
View file @ 12bbe31f
...@@ -56,7 +56,6 @@ varnishtest_LDADD = \ ...@@ -56,7 +56,6 @@ varnishtest_LDADD = \
$(top_builddir)/lib/libvarnish/libvarnish.la \ $(top_builddir)/lib/libvarnish/libvarnish.la \
$(top_builddir)/lib/libvgz/libvgz.a \ $(top_builddir)/lib/libvgz/libvgz.a \
@SAN_LDFLAGS@ \ @SAN_LDFLAGS@ \
@PCRE_LIBS@ \
${PTHREAD_LIBS} ${NET_LIBS} ${LIBM} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM}
varnishtest_CFLAGS = \ varnishtest_CFLAGS = \
......
lib/libvarnish/Makefile.am
View file @ 12bbe31f
...@@ -6,7 +6,7 @@ AM_CPPFLAGS = \ ...@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
@PCRE_CFLAGS@ @PCRE_CFLAGS@
AM_CFLAGS = $(AM_LT_CFLAGS) @SAN_CFLAGS@ AM_CFLAGS = $(AM_LT_CFLAGS) @SAN_CFLAGS@
AM_LDFLAGS = $(AM_LT_LDFLAGS) @SAN_LDFLAGS@ AM_LDFLAGS = $(AM_LT_LDFLAGS) @SAN_LDFLAGS@ @PCRE_LIBS@
noinst_LTLIBRARIES = libvarnish.la noinst_LTLIBRARIES = libvarnish.la
......
lib/libvarnishapi/Makefile.am
View file @ 12bbe31f
...@@ -4,8 +4,7 @@ AM_LDFLAGS = $(AM_LT_LDFLAGS) ...@@ -4,8 +4,7 @@ AM_LDFLAGS = $(AM_LT_LDFLAGS)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include
@PCRE_CFLAGS@
lib_LTLIBRARIES = libvarnishapi.la lib_LTLIBRARIES = libvarnishapi.la
...@@ -41,7 +40,7 @@ libvarnishapi_la_CFLAGS = \ ...@@ -41,7 +40,7 @@ libvarnishapi_la_CFLAGS = \
libvarnishapi_la_LIBADD = \ libvarnishapi_la_LIBADD = \
$(top_builddir)/lib/libvarnish/libvarnish.la \ $(top_builddir)/lib/libvarnish/libvarnish.la \
@SAN_LDFLAGS@ @PCRE_LIBS@ ${NET_LIBS} ${RT_LIBS} ${LIBM} @SAN_LDFLAGS@ ${NET_LIBS} ${RT_LIBS} ${LIBM}
if HAVE_LD_VERSION_SCRIPT if HAVE_LD_VERSION_SCRIPT
libvarnishapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libvarnishapi.map libvarnishapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libvarnishapi.map
...@@ -81,7 +80,8 @@ vxp_test_SOURCES = \ ...@@ -81,7 +80,8 @@ vxp_test_SOURCES = \
vxp_test_CFLAGS = \ vxp_test_CFLAGS = \
-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \ -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
-DVXP_DEBUG -DVXP_DEBUG
vxp_test_LDADD = @PCRE_LIBS@ \ vxp_test_LDADD = \
$(top_builddir)/lib/libvarnish/libvarnish.la \
${RT_LIBS} ${LIBM} ${PTHREAD_LIBS} ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
TESTS = vsl_glob_test TESTS = vsl_glob_test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment