Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
1a36149c
Commit
1a36149c
authored
Feb 21, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move vjsn from libvarnishapi to libvarnish
parent
9ee67866
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
10 deletions
+8
-10
Makefile.am
include/Makefile.am
+1
-0
vjsn.h
include/vjsn.h
+0
-0
Makefile.am
lib/libvarnish/Makefile.am
+5
-3
vjsn.c
lib/libvarnish/vjsn.c
+0
-0
Makefile.am
lib/libvarnishapi/Makefile.am
+2
-7
No files found.
include/Makefile.am
View file @
1a36149c
...
...
@@ -86,6 +86,7 @@ nobase_noinst_HEADERS = \
vev.h
\
vfil.h
\
vin.h
\
vjsn.h
\
vlu.h
\
vmb.h
\
vnum.h
\
...
...
lib/libvarnishapi
/vjsn.h
→
include
/vjsn.h
View file @
1a36149c
File moved
lib/libvarnish/Makefile.am
View file @
1a36149c
...
...
@@ -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
=
v
jsn_test v
num_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/libvarnish
api
/vjsn.c
→
lib/libvarnish/vjsn.c
View file @
1a36149c
File moved
lib/libvarnishapi/Makefile.am
View file @
1a36149c
...
...
@@ -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
=
v
jsn_test v
sl_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@
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment