Move vjsn from libvarnishapi to libvarnish

include/Makefile.am

@@ -86,6 +86,7 @@ nobase_noinst_HEADERS = \
 	vev.h \
 	vfil.h \
 	vin.h \
+	vjsn.h \
 	vlu.h \
 	vmb.h \
 	vnum.h \

lib/libvarnish/Makefile.am

@@ -25,6 +25,7 @@ libvarnish_a_SOURCES = \
 	vfil.c \
 	vfl.c \
 	vin.c \
+	vjsn.c \
 	vlu.c \
 	vmb.c \
 	vnum.c \
@@ -40,7 +41,7 @@ libvarnish_a_SOURCES = \
 	vtim.c \
 	vus.c
 
-TESTS = vnum_c_test binheap
+TESTS = vjsn_test vnum_c_test binheap
 
 noinst_PROGRAMS = ${TESTS}
 
@@ -51,5 +52,6 @@ vnum_c_test_SOURCES = vnum.c vas.c
 vnum_c_test_CFLAGS = -DNUM_C_TEST -include config.h
 vnum_c_test_LDADD = ${LIBM}
 
-test: ${TESTS}
-	@for test in ${TESTS} ; do ./$${test} ; done
+vjsn_test_SOURCES = vjsn.c
+vjsn_test_CFLAGS = -DVJSN_TEST @SAN_CFLAGS@
+vjsn_test_LDADD = libvarnish.a @SAN_LDFLAGS@

lib/libvarnishapi/Makefile.am

@@ -12,8 +12,6 @@ lib_LTLIBRARIES = libvarnishapi.la
 libvarnishapi_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:6:0
 
 libvarnishapi_la_SOURCES = \
-	vjsn.c \
-	vjsn.h \
 	vsl_api.h \
 	vxp.h \
 	vxp_tokens.h \
@@ -25,6 +23,7 @@ libvarnishapi_la_SOURCES = \
 	../libvarnish/vfil.c \
 	../libvarnish/vfl.c \
 	../libvarnish/vin.c \
+	../libvarnish/vjsn.c \
 	../libvarnish/vmb.c \
 	../libvarnish/vpf.c \
 	../libvarnish/vre.c \
@@ -98,14 +97,10 @@ vxp_test_CFLAGS = \
 vxp_test_LDADD = @PCRE_LIBS@ \
 	${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
 
-TESTS = vjsn_test vsl_glob_test
+TESTS = vsl_glob_test
 
 noinst_PROGRAMS += ${TESTS}
 
 vsl_glob_test_SOURCES = vsl_glob_test.c
 vsl_glob_test_CFLAGS = @SAN_CFLAGS@
 vsl_glob_test_LDADD = libvarnishapi.la @SAN_LDFLAGS@
-
-vjsn_test_SOURCES = vjsn.c
-vjsn_test_CFLAGS = -DVJSN_TEST @SAN_CFLAGS@
-vjsn_test_LDADD = libvarnishapi.la @SAN_LDFLAGS@