Commit 7a226ebd authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

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

in varnishadm and varnishreplay instead.
parent 230d8f2d
...@@ -7,14 +7,16 @@ bin_PROGRAMS = varnishadm ...@@ -7,14 +7,16 @@ bin_PROGRAMS = varnishadm
dist_man_MANS = varnishadm.1 dist_man_MANS = varnishadm.1
varnishadm_SOURCES = \ varnishadm_SOURCES = \
varnishadm.c varnishadm.c \
$(top_builddir)/lib/libvarnish/tcp.c \
$(top_builddir)/lib/libvarnish/vss.c
varnishadm_CFLAGS = @LIBEDIT_CFLAGS@ varnishadm_CFLAGS = @LIBEDIT_CFLAGS@
varnishadm_LDADD = \ varnishadm_LDADD = \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.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 varnishadm.1: $(top_srcdir)/doc/sphinx/reference/varnishadm.rst
if HAVE_RST2MAN if HAVE_RST2MAN
......
...@@ -7,12 +7,14 @@ bin_PROGRAMS = varnishreplay ...@@ -7,12 +7,14 @@ bin_PROGRAMS = varnishreplay
dist_man_MANS = varnishreplay.1 dist_man_MANS = varnishreplay.1
varnishreplay_SOURCES = \ varnishreplay_SOURCES = \
varnishreplay.c varnishreplay.c \
$(top_builddir)/lib/libvarnish/tcp.c \
$(top_builddir)/lib/libvarnish/vss.c
varnishreplay_LDADD = \ varnishreplay_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \ $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.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 varnishreplay.1: $(top_srcdir)/doc/sphinx/reference/varnishreplay.rst
if HAVE_RST2MAN if HAVE_RST2MAN
......
...@@ -16,13 +16,11 @@ libvarnishapi_la_SOURCES = \ ...@@ -16,13 +16,11 @@ libvarnishapi_la_SOURCES = \
../libvarnish/version.c \ ../libvarnish/version.c \
../libvarnish/cli_common.c \ ../libvarnish/cli_common.c \
../libvarnish/cli_auth.c \ ../libvarnish/cli_auth.c \
../libvarnish/tcp.c \
../libvarnish/vin.c \ ../libvarnish/vin.c \
../libvarnish/vmb.c \ ../libvarnish/vmb.c \
../libvarnish/vre.c \ ../libvarnish/vre.c \
../libvarnish/vsb.c \ ../libvarnish/vsb.c \
../libvarnish/vsha256.c \ ../libvarnish/vsha256.c \
../libvarnish/vss.c \
base64.c \ base64.c \
vsm.c \ vsm.c \
vsl_arg.c \ vsl_arg.c \
...@@ -32,4 +30,4 @@ libvarnishapi_la_SOURCES = \ ...@@ -32,4 +30,4 @@ libvarnishapi_la_SOURCES = \
libvarnishapi_la_CFLAGS = \ libvarnishapi_la_CFLAGS = \
-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"' -DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
libvarnishapi_la_LIBADD = @PCRE_LIBS@ ${LIBM} libvarnishapi_la_LIBADD = @PCRE_LIBS@
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