Permalink
Browse files

Move VUT into libvarnishapi

  • Loading branch information...
1 parent 42e2118 commit 36e8ac2fc77e8f8b63ea0a41b14d6555ea50433c @bsdphk bsdphk committed May 10, 2016
View
@@ -28,7 +28,6 @@ INSTALL_BASE ?= $(TOPDIR)/_install
LIB_VARNISH = -L $(TOPDIR)/lib/libvarnish -lvarnish
LIB_VARNISHAPI = $(TOPDIR)/lib/libvarnishapi/libvarnishapi.a
-LIB_VARNISHTOOLS = -L $(TOPDIR)/lib/libvarnishtools -lvarnishtools
LIB_VCC = -L $(TOPDIR)/lib/libvcc -lvcc
LIB_VGZ = -L $(TOPDIR)/lib/libvgz -lvgz
LIB_PCRE = -L /usr/local/lib -lpcre
@@ -78,15 +78,17 @@ PROG_SRC += mgt/mgt_vcc.c
PROG_SRC += mgt/mgt_vcl.c
PROG_SRC += mgt/mgt_acceptor.c
-PROG_SRC += storage/stevedore.c
PROG_SRC += storage/mgt_stevedore.c
+PROG_SRC += storage/mgt_storage_persistent.c
+PROG_SRC += storage/stevedore.c
PROG_SRC += storage/stevedore_utils.c
PROG_SRC += storage/storage_file.c
+PROG_SRC += storage/storage_lru.c
PROG_SRC += storage/storage_malloc.c
PROG_SRC += storage/storage_persistent.c
-PROG_SRC += storage/mgt_storage_persistent.c
PROG_SRC += storage/storage_persistent_silo.c
PROG_SRC += storage/storage_persistent_subr.c
+PROG_SRC += storage/storage_simple.c
PROG_SRC += storage/storage_umem.c
PROG_SRC += waiter/cache_waiter.c
@@ -11,10 +11,7 @@ varnishhist_SOURCES = varnishhist.c \
varnishhist_options.c \
$(top_srcdir)/lib/libvarnish/vas.c \
$(top_srcdir)/lib/libvarnish/version.c \
- $(top_srcdir)/lib/libvarnish/vpf.c \
- $(top_srcdir)/lib/libvarnish/vtim.c \
- $(top_srcdir)/lib/libvarnish/vfl.c \
- $(top_srcdir)/lib/libvarnishtools/vut.c
+ $(top_srcdir)/lib/libvarnish/vtim.c
varnishhist_CFLAGS = \
@SAN_CFLAGS@
@@ -1,7 +1,6 @@
PROG_SRC = varnishhist.c
PROG_SRC += varnishhist_options.c
-LD_ADD += ${LIB_VARNISHTOOLS}
LD_ADD += ${LIB_VARNISHAPI}
LD_ADD += ${LIB_VARNISH}
LD_ADD += -lpthread -lncurses -lm ${LIB_PCRE}
@@ -10,12 +10,9 @@ varnishlog_SOURCES = \
varnishlog.c \
varnishlog_options.h \
varnishlog_options.c \
- $(top_srcdir)/lib/libvarnishtools/vut.c \
$(top_srcdir)/lib/libvarnish/vas.c \
$(top_srcdir)/lib/libvarnish/version.c \
- $(top_srcdir)/lib/libvarnish/vfl.c \
$(top_srcdir)/lib/libvarnish/vsb.c \
- $(top_srcdir)/lib/libvarnish/vpf.c \
$(top_srcdir)/lib/libvarnish/vtim.c
varnishlog_CFLAGS = \
@@ -1,7 +1,6 @@
PROG_SRC = varnishlog.c
PROG_SRC = varnishlog_options.c
-LD_ADD += ${LIB_VARNISHTOOLS}
LD_ADD += ${LIB_VARNISHAPI}
LD_ADD += ${LIB_VARNISH}
LD_ADD += ${LIB_PCRE}
@@ -12,11 +12,8 @@ varnishncsa_SOURCES = \
varnishncsa_options.c \
base64.h \
base64.c \
- $(top_srcdir)/lib/libvarnishtools/vut.c \
$(top_srcdir)/lib/libvarnish/vas.c \
$(top_srcdir)/lib/libvarnish/version.c \
- $(top_srcdir)/lib/libvarnish/vfl.c \
- $(top_srcdir)/lib/libvarnish/vpf.c \
$(top_srcdir)/lib/libvarnish/vtim.c \
$(top_srcdir)/lib/libvarnish/vsb.c
@@ -2,7 +2,6 @@ PROG_SRC += base64.c
PROG_SRC += varnishncsa.c
PROG_SRC += varnishncsa_options.c
-LD_ADD += ${LIB_VARNISHTOOLS}
LD_ADD += ${LIB_VARNISHAPI}
LD_ADD += ${LIB_VARNISH}
LD_ADD += ${LIB_PCRE}
@@ -9,11 +9,8 @@ bin_PROGRAMS = varnishtop
varnishtop_SOURCES = varnishtop.c \
varnishtop_options.h \
varnishtop_options.c \
- $(top_srcdir)/lib/libvarnishtools/vut.c \
$(top_srcdir)/lib/libvarnish/vas.c \
$(top_srcdir)/lib/libvarnish/version.c \
- $(top_srcdir)/lib/libvarnish/vfl.c \
- $(top_srcdir)/lib/libvarnish/vpf.c \
$(top_srcdir)/lib/libvarnish/vtim.c \
$(top_srcdir)/lib/libvarnish/vsb.c
@@ -1,7 +1,6 @@
PROG_SRC += varnishtop.c
PROG_SRC += varnishtop_options.c
-LD_ADD += ${LIB_VARNISHTOOLS}
LD_ADD += ${LIB_VARNISHAPI}
LD_ADD += ${LIB_VARNISH}
LD_ADD += ${LIB_PCRE}
View
@@ -4,7 +4,6 @@ SUBDIRS = \
libvarnishcompat \
libvarnish \
libvarnishapi \
- libvarnishtools \
libvcc \
libvgz \
libvmod_debug \
View
@@ -1,4 +1,4 @@
-SUBDIRS = libvcc libvarnish libvarnishapi libvarnishtools libvcc
+SUBDIRS = libvcc libvarnish libvarnishapi libvcc
SUBDIRS += libvgz
SUBDIRS += libvmod_debug libvmod_directors libvmod_std
@@ -3,13 +3,13 @@ LIB_SRC += binary_heap.c
LIB_SRC += cli_auth.c
LIB_SRC += cli_common.c
LIB_SRC += cli_serve.c
-LIB_SRC += flopen.c
LIB_SRC += vas.c
LIB_SRC += vav.c
LIB_SRC += vct.c
LIB_SRC += version.c
LIB_SRC += vev.c
LIB_SRC += vfil.c
+LIB_SRC += vfl.c
LIB_SRC += vin.c
LIB_SRC += vlu.c
LIB_SRC += vmb.c
@@ -22,8 +22,10 @@ libvarnishapi_la_SOURCES = \
../libvarnish/version.c \
../libvarnish/cli_common.c \
../libvarnish/cli_auth.c \
+ ../libvarnish/vfl.c \
../libvarnish/vin.c \
../libvarnish/vmb.c \
+ ../libvarnish/vpf.c \
../libvarnish/vre.c \
../libvarnish/vsb.c \
../libvarnish/vtim.c \
@@ -36,6 +38,7 @@ libvarnishapi_la_SOURCES = \
vsl_query.c \
vsl.c \
vsc.c \
+ vut.c \
vxp.c \
vxp_parse.c \
vxp_lexer.c \
@@ -7,6 +7,7 @@ LIB_SRC += vsl_cursor.c
LIB_SRC += vsl_dispatch.c
LIB_SRC += vsl_query.c
LIB_SRC += vsm.c
+LIB_SRC += vut.c
LIB_SRC += vxp.c
LIB_SRC += vxp_fixed_token.c
LIB_SRC += vxp_lexer.c
@@ -16,11 +17,13 @@ LIB_SRC += vxp_parse.c
# We add more stuff to the SHLIB version to make it self-contained
SHLIB_SRC = $(LIB_SRC)
VPATH += ../libvarnish
-SHLIB_SRC += vre.c
-SHLIB_SRC += vsb.c
SHLIB_SRC += vas.c
SHLIB_SRC += vav.c
+SHLIB_SRC += vfl.c
SHLIB_SRC += vin.c
+SHLIB_SRC += vpf.c
+SHLIB_SRC += vre.c
+SHLIB_SRC += vsb.c
SHLIB_SRC += vtim.c
#LIB_SRC += vsl_glob_test.c
@@ -131,3 +131,15 @@ LIBVARNISHAPI_1.4 {
VSLQ_SetCursor;
VSM_IsOpen;
} LIBVARNISHAPI_1.0;
+
+LIBVARNISHAPI_1.5 {
+ global:
+ VUT_Error;
+ VUT_g_Arg;
+ VUT_Arg;
+ VUT_Setup;
+ VUT_Init;
+ VUT_Fini;
+ VUT_Main;
+ VUT;
+} LIBVARNISHAPI_1.0;
File renamed without changes.
@@ -1,4 +0,0 @@
-#
-
-EXTRA_DIST = \
- vut.c
@@ -1,6 +0,0 @@
-
-LIB_SRC += opt2rst.c
-LIB_SRC += vut.c
-
-TOPDIR= $(CURDIR)/../..
-include $(TOPDIR)/Makefile.inc.phk

0 comments on commit 36e8ac2

Please sign in to comment.