[master] ea4b77c Remove warnings and add libm to libvarnishapi

Federico G. Schwindt fgsch at lodoss.net
Tue Dec 6 00:33:04 CET 2016


commit ea4b77cac2a76b59362b765179014421e38a9f64
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Dec 5 23:29:07 2016 +0000

    Remove warnings and add libm to libvarnishapi

diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index 38db461..6e008d9 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -13,8 +13,6 @@ libvarnish_a_CFLAGS = \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
 	@SAN_CFLAGS@
 
-libvarnish_a_LDFLAGS = $(AM_LDFLAGS)
-
 libvarnish_a_SOURCES = \
 	binary_heap.c \
 	vas.c \
diff --git a/lib/libvarnishapi/Makefile.am b/lib/libvarnishapi/Makefile.am
index 455cf3a..9c04122 100644
--- a/lib/libvarnishapi/Makefile.am
+++ b/lib/libvarnishapi/Makefile.am
@@ -48,8 +48,8 @@ libvarnishapi_la_CFLAGS = \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
 	@SAN_CFLAGS@
 
-libvarnishapi_la_LIBADD = @PCRE_LIBS@ @RT_LIBS@ \
-	@SAN_LDFLAGS@
+libvarnishapi_la_LIBADD = \
+	@SAN_LDFLAGS@ @PCRE_LIBS@ ${RT_LIBS} ${LIBM}
 
 if HAVE_LD_VERSION_SCRIPT
 libvarnishapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libvarnishapi.map
diff --git a/lib/libvcc/Makefile.am b/lib/libvcc/Makefile.am
index 311d849..795b173 100644
--- a/lib/libvcc/Makefile.am
+++ b/lib/libvcc/Makefile.am
@@ -11,9 +11,6 @@ noinst_LIBRARIES = libvcc.a
 libvcc_a_CFLAGS = \
 	@SAN_CFLAGS@
 
-libvcc_a_LDFLAGS = $(AM_LDFLAGS) \
-	@SAN_LDFLAGS@
-
 libvcc_a_SOURCES = \
 	vcc_compile.h \
 	vcc_token_defs.h \
diff --git a/lib/libvgz/Makefile.am b/lib/libvgz/Makefile.am
index 4d159f0..74afccf 100644
--- a/lib/libvgz/Makefile.am
+++ b/lib/libvgz/Makefile.am
@@ -7,9 +7,6 @@ noinst_LIBRARIES = libvgz.a
 libvgz_a_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST \
 	$(libvgz_extra_cflags) @SAN_CFLAGS@
 
-libvgz_a_LDFLAGS = $(AM_LDFLAGS) \
-	@SAN_LDFLAGS@
-
 libvgz_a_SOURCES = \
 	adler32.c \
 	compress.c \



More information about the varnish-commit mailing list