[master] 2e32704 Expose (parts of) VTIM, VSB, VAS and VCS via libvarnishapi.

Poul-Henning Kamp phk at FreeBSD.org
Tue May 10 13:04:07 CEST 2016


commit 2e32704fee4d79a0aa44f0b833a43feb55f1801c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 10 11:03:13 2016 +0000

    Expose (parts of) VTIM, VSB, VAS and VCS via libvarnishapi.

diff --git a/bin/varnishadm/Makefile.am b/bin/varnishadm/Makefile.am
index d218bc9..d4dd781 100644
--- a/bin/varnishadm/Makefile.am
+++ b/bin/varnishadm/Makefile.am
@@ -8,7 +8,6 @@ bin_PROGRAMS = varnishadm
 
 varnishadm_SOURCES = \
 	varnishadm.c \
-	$(top_srcdir)/lib/libvarnish/vas.c \
 	$(top_srcdir)/lib/libvarnish/vsa.c \
 	$(top_srcdir)/lib/libvarnish/vtcp.c \
 	$(top_srcdir)/lib/libvarnish/vss.c
diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index f814bf2..891b425 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -8,10 +8,7 @@ bin_PROGRAMS = varnishhist
 
 varnishhist_SOURCES = varnishhist.c \
 	varnishhist_options.h \
-	varnishhist_options.c \
-	$(top_srcdir)/lib/libvarnish/vas.c \
-	$(top_srcdir)/lib/libvarnish/version.c \
-	$(top_srcdir)/lib/libvarnish/vtim.c
+	varnishhist_options.c
 
 varnishhist_CFLAGS = \
 	@SAN_CFLAGS@
diff --git a/bin/varnishlog/Makefile.am b/bin/varnishlog/Makefile.am
index 92b93d3..9e309e7 100644
--- a/bin/varnishlog/Makefile.am
+++ b/bin/varnishlog/Makefile.am
@@ -9,11 +9,7 @@ bin_PROGRAMS = varnishlog
 varnishlog_SOURCES = \
 	varnishlog.c \
 	varnishlog_options.h \
-	varnishlog_options.c \
-	$(top_srcdir)/lib/libvarnish/vas.c \
-	$(top_srcdir)/lib/libvarnish/version.c \
-	$(top_srcdir)/lib/libvarnish/vsb.c \
-	$(top_srcdir)/lib/libvarnish/vtim.c
+	varnishlog_options.c
 
 varnishlog_CFLAGS = \
 	@SAN_CFLAGS@
diff --git a/bin/varnishncsa/Makefile.am b/bin/varnishncsa/Makefile.am
index bb470f7..a6cbeb7 100644
--- a/bin/varnishncsa/Makefile.am
+++ b/bin/varnishncsa/Makefile.am
@@ -11,11 +11,7 @@ varnishncsa_SOURCES = \
 	varnishncsa_options.h \
 	varnishncsa_options.c \
 	base64.h \
-	base64.c \
-	$(top_srcdir)/lib/libvarnish/vas.c \
-	$(top_srcdir)/lib/libvarnish/version.c \
-	$(top_srcdir)/lib/libvarnish/vtim.c \
-	$(top_srcdir)/lib/libvarnish/vsb.c
+	base64.c
 
 varnishncsa_CFLAGS = \
 	@SAN_CFLAGS@
diff --git a/bin/varnishstat/Makefile.am b/bin/varnishstat/Makefile.am
index 52fb5d8..5c0a179 100644
--- a/bin/varnishstat/Makefile.am
+++ b/bin/varnishstat/Makefile.am
@@ -10,10 +10,7 @@ varnishstat_SOURCES = \
 	varnishstat.h \
 	\
 	varnishstat.c \
-	varnishstat_curses.c \
-	$(top_srcdir)/lib/libvarnish/vas.c \
-	$(top_srcdir)/lib/libvarnish/version.c \
-	$(top_srcdir)/lib/libvarnish/vtim.c
+	varnishstat_curses.c
 
 varnishstat_CFLAGS = \
 	@SAN_CFLAGS@
diff --git a/bin/varnishtop/Makefile.am b/bin/varnishtop/Makefile.am
index 9406d62..fdd993a 100644
--- a/bin/varnishtop/Makefile.am
+++ b/bin/varnishtop/Makefile.am
@@ -8,11 +8,7 @@ bin_PROGRAMS = varnishtop
 
 varnishtop_SOURCES = varnishtop.c \
 	varnishtop_options.h \
-	varnishtop_options.c \
-	$(top_srcdir)/lib/libvarnish/vas.c \
-	$(top_srcdir)/lib/libvarnish/version.c \
-	$(top_srcdir)/lib/libvarnish/vtim.c \
-	$(top_srcdir)/lib/libvarnish/vsb.c
+	varnishtop_options.c
 
 
 varnishtop_CFLAGS = \
diff --git a/lib/libvarnishapi/libvarnishapi.map b/lib/libvarnishapi/libvarnishapi.map
index 3401363..f9d189a 100644
--- a/lib/libvarnishapi/libvarnishapi.map
+++ b/lib/libvarnishapi/libvarnishapi.map
@@ -142,4 +142,23 @@ LIBVARNISHAPI_1.5 {
 	VUT_Fini;
 	VUT_Main;
 	VUT;
+
+	VTIM_mono;
+	VTIM_real;
+	VTIM_sleep;
+
+	VSB_new;
+	VSB_destroy;
+	VSB_error;
+	VSB_cat;
+	VSB_putc;
+	VSB_printf;
+	VSB_clear;
+	VSB_finish;
+	VSB_len;
+	VSB_data;
+
+	VAS_Fail;
+
+	VCS_Message;
 } LIBVARNISHAPI_1.0;



More information about the varnish-commit mailing list