[master] 932035b Make libvarnish, libvcc and libvgz static

[Federico G. Schwindt]

commit 932035b6d11896e41a9728e0c3fd809f01e0b56b
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Dec 5 19:25:10 2016 +0000

    Make libvarnish, libvcc and libvgz static

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 1d02ba0..0d541ca 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -150,10 +150,10 @@ varnishd_CFLAGS = \
 varnishd_LDFLAGS = -export-dynamic
 
 varnishd_LDADD = \
-	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libvarnish/libvarnish.a \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
-	$(top_builddir)/lib/libvcc/libvcc.la \
-	$(top_builddir)/lib/libvgz/libvgz.la \
+	$(top_builddir)/lib/libvcc/libvcc.a \
+	$(top_builddir)/lib/libvgz/libvgz.a \
 	@SAN_LDFLAGS@ \
 	@JEMALLOC_LDADD@ \
 	@PCRE_LIBS@ \
@@ -163,19 +163,19 @@ noinst_PROGRAMS = vhp_gen_hufdec
 vhp_gen_hufdec_SOURCES = hpack/vhp_gen_hufdec.c
 vhp_gen_hufdec_CFLAGS = -include config.h
 vhp_gen_hufdec_LDADD = \
-	$(top_builddir)/lib/libvarnish/libvarnish.la
+	$(top_builddir)/lib/libvarnish/libvarnish.a
 
 noinst_PROGRAMS += vhp_table_test
 vhp_table_test_SOURCES = hpack/vhp_table.c
 vhp_table_test_CFLAGS = -DTABLE_TEST_DRIVER -include config.h
 vhp_table_test_LDADD = \
-	$(top_builddir)/lib/libvarnish/libvarnish.la
+	$(top_builddir)/lib/libvarnish/libvarnish.a
 
 noinst_PROGRAMS += vhp_decode_test
 vhp_decode_test_SOURCES = hpack/vhp_decode.c hpack/vhp_table.c
 vhp_decode_test_CFLAGS = -DDECODE_TEST_DRIVER -include config.h
 vhp_decode_test_LDADD = \
-	$(top_builddir)/lib/libvarnish/libvarnish.la
+	$(top_builddir)/lib/libvarnish/libvarnish.a
 
 TESTS = vhp_table_test vhp_decode_test
 
diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index 26563e2..3b738b3 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -49,11 +49,12 @@ varnishtest_SOURCES = \
 		vtc_varnish.c
 
 varnishtest_LDADD = \
-		$(top_builddir)/lib/libvarnish/libvarnish.la \
+		$(top_builddir)/lib/libvarnish/libvarnish.a \
 		$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 		$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
-		$(top_builddir)/lib/libvgz/libvgz.la \
+		$(top_builddir)/lib/libvgz/libvgz.a \
 		@SAN_LDFLAGS@ \
+		@PCRE_LIBS@ \
 		${LIBM} ${PTHREAD_LIBS}
 
 varnishtest_CFLAGS = \
diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index d98cfca..38db461 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -1,3 +1,5 @@
+#
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
@@ -5,11 +7,15 @@ AM_CPPFLAGS = \
 
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
-pkglib_LTLIBRARIES = libvarnish.la
+noinst_LIBRARIES = libvarnish.a
+
+libvarnish_a_CFLAGS = \
+	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
+	@SAN_CFLAGS@
 
-libvarnish_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+libvarnish_a_LDFLAGS = $(AM_LDFLAGS)
 
-libvarnish_la_SOURCES = \
+libvarnish_a_SOURCES = \
 	binary_heap.c \
 	vas.c \
 	vav.c \
@@ -35,12 +41,6 @@ libvarnish_la_SOURCES = \
 	vtcp.c \
 	vtim.c
 
-libvarnish_la_CFLAGS = \
-	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' \
-	@SAN_CFLAGS@
-libvarnish_la_LIBADD = ${RT_LIBS} ${NET_LIBS} ${LIBM} @PCRE_LIBS@ \
-	@SAN_LDFLAGS@
-
 TESTS = vnum_c_test
 
 noinst_PROGRAMS = ${TESTS}
diff --git a/lib/libvcc/Makefile.am b/lib/libvcc/Makefile.am
index 70fad80..311d849 100644
--- a/lib/libvcc/Makefile.am
+++ b/lib/libvcc/Makefile.am
@@ -6,18 +6,17 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include
 
-pkglib_LTLIBRARIES = libvcc.la
+noinst_LIBRARIES = libvcc.a
 
-libvcc_la_CFLAGS = \
+libvcc_a_CFLAGS = \
 	@SAN_CFLAGS@
 
-libvcc_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \
+libvcc_a_LDFLAGS = $(AM_LDFLAGS) \
 	@SAN_LDFLAGS@
 
-libvcc_la_SOURCES = \
+libvcc_a_SOURCES = \
 	vcc_compile.h \
 	vcc_token_defs.h \
-	\
 	vcc_acl.c \
 	vcc_action.c \
 	vcc_backend.c \
diff --git a/lib/libvgz/Makefile.am b/lib/libvgz/Makefile.am
index f4aa8e9..4d159f0 100644
--- a/lib/libvgz/Makefile.am
+++ b/lib/libvgz/Makefile.am
@@ -1,14 +1,16 @@
 #
+
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
-pkglib_LTLIBRARIES = libvgz.la
+noinst_LIBRARIES = libvgz.a
+
+libvgz_a_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST \
+	$(libvgz_extra_cflags) @SAN_CFLAGS@
 
-libvgz_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \
+libvgz_a_LDFLAGS = $(AM_LDFLAGS) \
 	@SAN_LDFLAGS@
-libvgz_la_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST $(libvgz_extra_cflags) \
-	@SAN_CFLAGS@
 
-libvgz_la_SOURCES = \
+libvgz_a_SOURCES = \
 	adler32.c \
 	compress.c \
 	crc32.c \