Don't add vss and vtcp to libvarnishapi, pull them directly

in varnishadm and varnishreplay instead.
varnish · May 31, 2011 · 7a226eb · 7a226eb
1 parent 230d8f2
commit 7a226eb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/bin/varnishadm/Makefile.am b/bin/varnishadm/Makefile.am
@@ -7,14 +7,16 @@ bin_PROGRAMS = varnishadm
 dist_man_MANS = varnishadm.1
 
 varnishadm_SOURCES = \
-	varnishadm.c
+	varnishadm.c \
+	$(top_builddir)/lib/libvarnish/tcp.c \
+	$(top_builddir)/lib/libvarnish/vss.c
 
 varnishadm_CFLAGS = @LIBEDIT_CFLAGS@
 
 varnishadm_LDADD = \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
-	${PTHREAD_LIBS} ${NET_LIBS} @LIBEDIT_LIBS@
+	${PTHREAD_LIBS} ${NET_LIBS} @LIBEDIT_LIBS@ ${LIBM}
 
 varnishadm.1: $(top_srcdir)/doc/sphinx/reference/varnishadm.rst
 if HAVE_RST2MAN

diff --git a/bin/varnishreplay/Makefile.am b/bin/varnishreplay/Makefile.am
@@ -7,12 +7,14 @@ bin_PROGRAMS = varnishreplay
 dist_man_MANS = varnishreplay.1
 
 varnishreplay_SOURCES = \
-	varnishreplay.c
+	varnishreplay.c \
+	$(top_builddir)/lib/libvarnish/tcp.c \
+	$(top_builddir)/lib/libvarnish/vss.c
 
 varnishreplay_LDADD = \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
-	${PTHREAD_LIBS} ${NET_LIBS}
+	${PTHREAD_LIBS} ${NET_LIBS} ${LIBM}
 
 varnishreplay.1: $(top_srcdir)/doc/sphinx/reference/varnishreplay.rst
 if HAVE_RST2MAN

diff --git a/lib/libvarnishapi/Makefile.am b/lib/libvarnishapi/Makefile.am
@@ -16,13 +16,11 @@ libvarnishapi_la_SOURCES = \
 	../libvarnish/version.c \
 	../libvarnish/cli_common.c \
 	../libvarnish/cli_auth.c \
-	../libvarnish/tcp.c \
 	../libvarnish/vin.c \
 	../libvarnish/vmb.c \
 	../libvarnish/vre.c \
 	../libvarnish/vsb.c \
 	../libvarnish/vsha256.c \
-	../libvarnish/vss.c \
 	base64.c \
 	vsm.c \
 	vsl_arg.c \
@@ -32,4 +30,4 @@ libvarnishapi_la_SOURCES = \
 libvarnishapi_la_CFLAGS = \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
 
-libvarnishapi_la_LIBADD = @PCRE_LIBS@ ${LIBM}
+libvarnishapi_la_LIBADD = @PCRE_LIBS@