[master] 7e265ab1d build: Manage libvgz with libtool
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Mon Sep 20 09:15:07 UTC 2021
commit 7e265ab1d5aca44f2e7a03c662c59129d94977e8
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Mon Sep 20 10:56:07 2021 +0200
build: Manage libvgz with libtool
It's still a static library, but the build is slightly more uniform.
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 4524dd229..7ca48c873 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -177,7 +177,7 @@ varnishd_LDFLAGS = -export-dynamic
varnishd_LDADD = \
$(top_builddir)/lib/libvcc/libvcc.la \
$(top_builddir)/lib/libvarnish/libvarnish.la \
- $(top_builddir)/lib/libvgz/libvgz.a \
+ $(top_builddir)/lib/libvgz/libvgz.la \
@JEMALLOC_LDADD@ \
${DL_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${RT_LIBS} ${LIBM}
@@ -208,7 +208,7 @@ esi_parse_fuzzer_CFLAGS = \
-DNOT_IN_A_VMOD
esi_parse_fuzzer_LDADD = \
$(top_builddir)/lib/libvarnish/libvarnish.la \
- $(top_builddir)/lib/libvgz/libvgz.a
+ $(top_builddir)/lib/libvgz/libvgz.la
if ENABLE_OSS_FUZZ
esi_parse_fuzzer_LDFLAGS = $(LIB_FUZZING_ENGINE)
diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index 3a79b6fff..4937381d0 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -54,7 +54,7 @@ varnishtest_SOURCES = \
varnishtest_LDADD = \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
$(top_builddir)/lib/libvarnish/libvarnish.la \
- $(top_builddir)/lib/libvgz/libvgz.a \
+ $(top_builddir)/lib/libvgz/libvgz.la \
${PTHREAD_LIBS} ${NET_LIBS} ${LIBM}
varnishtest_CFLAGS = \
diff --git a/lib/libvgz/Makefile.am b/lib/libvgz/Makefile.am
index 5cee560e7..52fd2f0fb 100644
--- a/lib/libvgz/Makefile.am
+++ b/lib/libvgz/Makefile.am
@@ -2,12 +2,12 @@
AM_LDFLAGS = $(AM_LT_LDFLAGS)
-noinst_LIBRARIES = libvgz.a
+noinst_LTLIBRARIES = libvgz.la
-libvgz_a_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST \
+libvgz_la_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST \
$(libvgz_extra_cflags)
-libvgz_a_SOURCES = \
+libvgz_la_SOURCES = \
adler32.c \
crc32.c \
crc32.h \
More information about the varnish-commit
mailing list