Skip to content

V
varnish-cache
Commit 1a36149c authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Move vjsn from libvarnishapi to libvarnish

parent 9ee67866
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 10 deletions
include/Makefile.am
View file @ 1a36149c
...@@ -86,6 +86,7 @@ nobase_noinst_HEADERS = \ ...@@ -86,6 +86,7 @@ nobase_noinst_HEADERS = \
vev.h \ vev.h \
vfil.h \ vfil.h \
vin.h \ vin.h \
vjsn.h \
vlu.h \ vlu.h \
vmb.h \ vmb.h \
vnum.h \ vnum.h \
......
lib/libvarnish/Makefile.am
View file @ 1a36149c
...@@ -25,6 +25,7 @@ libvarnish_a_SOURCES = \ ...@@ -25,6 +25,7 @@ libvarnish_a_SOURCES = \
vfil.c \ vfil.c \
vfl.c \ vfl.c \
vin.c \ vin.c \
vjsn.c \
vlu.c \ vlu.c \
vmb.c \ vmb.c \
vnum.c \ vnum.c \
...@@ -40,7 +41,7 @@ libvarnish_a_SOURCES = \ ...@@ -40,7 +41,7 @@ libvarnish_a_SOURCES = \
vtim.c \ vtim.c \
vus.c vus.c
TESTS = vnum_c_test binheap TESTS = vjsn_test vnum_c_test binheap
noinst_PROGRAMS = ${TESTS} noinst_PROGRAMS = ${TESTS}
...@@ -51,5 +52,6 @@ vnum_c_test_SOURCES = vnum.c vas.c ...@@ -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_CFLAGS = -DNUM_C_TEST -include config.h
vnum_c_test_LDADD = ${LIBM} vnum_c_test_LDADD = ${LIBM}
test: ${TESTS} vjsn_test_SOURCES = vjsn.c
@for test in ${TESTS} ; do ./$${test} ; done vjsn_test_CFLAGS = -DVJSN_TEST @SAN_CFLAGS@
vjsn_test_LDADD = libvarnish.a @SAN_LDFLAGS@
lib/libvarnishapi/Makefile.am
View file @ 1a36149c
...@@ -12,8 +12,6 @@ lib_LTLIBRARIES = libvarnishapi.la ...@@ -12,8 +12,6 @@ lib_LTLIBRARIES = libvarnishapi.la
libvarnishapi_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:6:0 libvarnishapi_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:6:0
libvarnishapi_la_SOURCES = \ libvarnishapi_la_SOURCES = \
vjsn.c \
vjsn.h \
vsl_api.h \ vsl_api.h \
vxp.h \ vxp.h \
vxp_tokens.h \ vxp_tokens.h \
...@@ -25,6 +23,7 @@ libvarnishapi_la_SOURCES = \ ...@@ -25,6 +23,7 @@ libvarnishapi_la_SOURCES = \
../libvarnish/vfil.c \ ../libvarnish/vfil.c \
../libvarnish/vfl.c \ ../libvarnish/vfl.c \
../libvarnish/vin.c \ ../libvarnish/vin.c \
../libvarnish/vjsn.c \
../libvarnish/vmb.c \ ../libvarnish/vmb.c \
../libvarnish/vpf.c \ ../libvarnish/vpf.c \
../libvarnish/vre.c \ ../libvarnish/vre.c \
...@@ -98,14 +97,10 @@ vxp_test_CFLAGS = \ ...@@ -98,14 +97,10 @@ vxp_test_CFLAGS = \
vxp_test_LDADD = @PCRE_LIBS@ \ vxp_test_LDADD = @PCRE_LIBS@ \
${RT_LIBS} ${LIBM} ${PTHREAD_LIBS} ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
TESTS = vjsn_test vsl_glob_test TESTS = vsl_glob_test
noinst_PROGRAMS += ${TESTS} noinst_PROGRAMS += ${TESTS}
vsl_glob_test_SOURCES = vsl_glob_test.c vsl_glob_test_SOURCES = vsl_glob_test.c
vsl_glob_test_CFLAGS = @SAN_CFLAGS@ vsl_glob_test_CFLAGS = @SAN_CFLAGS@
vsl_glob_test_LDADD = libvarnishapi.la @SAN_LDFLAGS@ 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@
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