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
932035b6
Commit
932035b6
authored
Dec 05, 2016
by
Federico G. Schwindt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make libvarnish, libvcc and libvgz static
parent
7e99c801
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
27 deletions
+29
-27
Makefile.am
bin/varnishd/Makefile.am
+6
-6
Makefile.am
bin/varnishtest/Makefile.am
+3
-2
Makefile.am
lib/libvarnish/Makefile.am
+9
-9
Makefile.am
lib/libvcc/Makefile.am
+4
-5
Makefile.am
lib/libvgz/Makefile.am
+7
-5
No files found.
bin/varnishd/Makefile.am
View file @
932035b6
...
@@ -150,10 +150,10 @@ varnishd_CFLAGS = \
...
@@ -150,10 +150,10 @@ varnishd_CFLAGS = \
varnishd_LDFLAGS
=
-export-dynamic
varnishd_LDFLAGS
=
-export-dynamic
varnishd_LDADD
=
\
varnishd_LDADD
=
\
$(top_builddir)
/lib/libvarnish/libvarnish.
l
a
\
$(top_builddir)
/lib/libvarnish/libvarnish.a
\
$(top_builddir)
/lib/libvarnishcompat/libvarnishcompat.la
\
$(top_builddir)
/lib/libvarnishcompat/libvarnishcompat.la
\
$(top_builddir)
/lib/libvcc/libvcc.
l
a
\
$(top_builddir)
/lib/libvcc/libvcc.a
\
$(top_builddir)
/lib/libvgz/libvgz.
l
a
\
$(top_builddir)
/lib/libvgz/libvgz.a
\
@SAN_LDFLAGS@
\
@SAN_LDFLAGS@
\
@JEMALLOC_LDADD@
\
@JEMALLOC_LDADD@
\
@PCRE_LIBS@
\
@PCRE_LIBS@
\
...
@@ -163,19 +163,19 @@ noinst_PROGRAMS = vhp_gen_hufdec
...
@@ -163,19 +163,19 @@ noinst_PROGRAMS = vhp_gen_hufdec
vhp_gen_hufdec_SOURCES
=
hpack/vhp_gen_hufdec.c
vhp_gen_hufdec_SOURCES
=
hpack/vhp_gen_hufdec.c
vhp_gen_hufdec_CFLAGS
=
-include
config.h
vhp_gen_hufdec_CFLAGS
=
-include
config.h
vhp_gen_hufdec_LDADD
=
\
vhp_gen_hufdec_LDADD
=
\
$(top_builddir)
/lib/libvarnish/libvarnish.
l
a
$(top_builddir)
/lib/libvarnish/libvarnish.a
noinst_PROGRAMS
+=
vhp_table_test
noinst_PROGRAMS
+=
vhp_table_test
vhp_table_test_SOURCES
=
hpack/vhp_table.c
vhp_table_test_SOURCES
=
hpack/vhp_table.c
vhp_table_test_CFLAGS
=
-DTABLE_TEST_DRIVER
-include
config.h
vhp_table_test_CFLAGS
=
-DTABLE_TEST_DRIVER
-include
config.h
vhp_table_test_LDADD
=
\
vhp_table_test_LDADD
=
\
$(top_builddir)
/lib/libvarnish/libvarnish.
l
a
$(top_builddir)
/lib/libvarnish/libvarnish.a
noinst_PROGRAMS
+=
vhp_decode_test
noinst_PROGRAMS
+=
vhp_decode_test
vhp_decode_test_SOURCES
=
hpack/vhp_decode.c hpack/vhp_table.c
vhp_decode_test_SOURCES
=
hpack/vhp_decode.c hpack/vhp_table.c
vhp_decode_test_CFLAGS
=
-DDECODE_TEST_DRIVER
-include
config.h
vhp_decode_test_CFLAGS
=
-DDECODE_TEST_DRIVER
-include
config.h
vhp_decode_test_LDADD
=
\
vhp_decode_test_LDADD
=
\
$(top_builddir)
/lib/libvarnish/libvarnish.
l
a
$(top_builddir)
/lib/libvarnish/libvarnish.a
TESTS
=
vhp_table_test vhp_decode_test
TESTS
=
vhp_table_test vhp_decode_test
...
...
bin/varnishtest/Makefile.am
View file @
932035b6
...
@@ -49,11 +49,12 @@ varnishtest_SOURCES = \
...
@@ -49,11 +49,12 @@ varnishtest_SOURCES = \
vtc_varnish.c
vtc_varnish.c
varnishtest_LDADD
=
\
varnishtest_LDADD
=
\
$(top_builddir)
/lib/libvarnish/libvarnish.
l
a
\
$(top_builddir)
/lib/libvarnish/libvarnish.a
\
$(top_builddir)
/lib/libvarnishcompat/libvarnishcompat.la
\
$(top_builddir)
/lib/libvarnishcompat/libvarnishcompat.la
\
$(top_builddir)
/lib/libvarnishapi/libvarnishapi.la
\
$(top_builddir)
/lib/libvarnishapi/libvarnishapi.la
\
$(top_builddir)
/lib/libvgz/libvgz.
l
a
\
$(top_builddir)
/lib/libvgz/libvgz.a
\
@SAN_LDFLAGS@
\
@SAN_LDFLAGS@
\
@PCRE_LIBS@
\
${
LIBM
}
${
PTHREAD_LIBS
}
${
LIBM
}
${
PTHREAD_LIBS
}
varnishtest_CFLAGS
=
\
varnishtest_CFLAGS
=
\
...
...
lib/libvarnish/Makefile.am
View file @
932035b6
#
AM_CPPFLAGS
=
\
AM_CPPFLAGS
=
\
-I
$(top_srcdir)
/include
\
-I
$(top_srcdir)
/include
\
-I
$(top_builddir)
/include
\
-I
$(top_builddir)
/include
\
...
@@ -5,11 +7,15 @@ AM_CPPFLAGS = \
...
@@ -5,11 +7,15 @@ AM_CPPFLAGS = \
AM_LDFLAGS
=
$(AM_LT_LDFLAGS)
AM_LDFLAGS
=
$(AM_LT_LDFLAGS)
pkglib_LTLIBRARIES
=
libvarnish.la
noinst_LIBRARIES
=
libvarnish.a
libvarnish_a_CFLAGS
=
\
-DVARNISH_STATE_DIR
=
'"${VARNISH_STATE_DIR}"'
\
@SAN_CFLAGS@
libvarnish_
la_LDFLAGS
=
$(AM_LDFLAGS)
-avoid-version
libvarnish_
a_LDFLAGS
=
$(AM_LDFLAGS)
libvarnish_
l
a_SOURCES
=
\
libvarnish_a_SOURCES
=
\
binary_heap.c
\
binary_heap.c
\
vas.c
\
vas.c
\
vav.c
\
vav.c
\
...
@@ -35,12 +41,6 @@ libvarnish_la_SOURCES = \
...
@@ -35,12 +41,6 @@ libvarnish_la_SOURCES = \
vtcp.c
\
vtcp.c
\
vtim.c
vtim.c
libvarnish_la_CFLAGS
=
\
-DVARNISH_STATE_DIR
=
'"${VARNISH_STATE_DIR}"'
\
@SAN_CFLAGS@
libvarnish_la_LIBADD
=
${
RT_LIBS
}
${
NET_LIBS
}
${
LIBM
}
@PCRE_LIBS@
\
@SAN_LDFLAGS@
TESTS
=
vnum_c_test
TESTS
=
vnum_c_test
noinst_PROGRAMS
=
${
TESTS
}
noinst_PROGRAMS
=
${
TESTS
}
...
...
lib/libvcc/Makefile.am
View file @
932035b6
...
@@ -6,18 +6,17 @@ AM_CPPFLAGS = \
...
@@ -6,18 +6,17 @@ AM_CPPFLAGS = \
-I
$(top_srcdir)
/include
\
-I
$(top_srcdir)
/include
\
-I
$(top_builddir)
/include
-I
$(top_builddir)
/include
pkglib_LTLIBRARIES
=
libvcc.l
a
noinst_LIBRARIES
=
libvcc.
a
libvcc_
l
a_CFLAGS
=
\
libvcc_a_CFLAGS
=
\
@SAN_CFLAGS@
@SAN_CFLAGS@
libvcc_
la_LDFLAGS
=
$(AM_LDFLAGS)
-avoid-version
\
libvcc_
a_LDFLAGS
=
$(AM_LDFLAGS)
\
@SAN_LDFLAGS@
@SAN_LDFLAGS@
libvcc_
l
a_SOURCES
=
\
libvcc_a_SOURCES
=
\
vcc_compile.h
\
vcc_compile.h
\
vcc_token_defs.h
\
vcc_token_defs.h
\
\
vcc_acl.c
\
vcc_acl.c
\
vcc_action.c
\
vcc_action.c
\
vcc_backend.c
\
vcc_backend.c
\
...
...
lib/libvgz/Makefile.am
View file @
932035b6
#
#
AM_LDFLAGS
=
$(AM_LT_LDFLAGS)
AM_LDFLAGS
=
$(AM_LT_LDFLAGS)
pkglib_LTLIBRARIES
=
libvgz.la
noinst_LIBRARIES
=
libvgz.a
libvgz_a_CFLAGS
=
-D_LARGEFILE64_SOURCE
=
1
-DZLIB_CONST
\
$(libvgz_extra_cflags)
@SAN_CFLAGS@
libvgz_
la_LDFLAGS
=
$(AM_LDFLAGS)
-avoid-version
\
libvgz_
a_LDFLAGS
=
$(AM_LDFLAGS)
\
@SAN_LDFLAGS@
@SAN_LDFLAGS@
libvgz_la_CFLAGS
=
-D_LARGEFILE64_SOURCE
=
1
-DZLIB_CONST
$(libvgz_extra_cflags)
\
@SAN_CFLAGS@
libvgz_
l
a_SOURCES
=
\
libvgz_a_SOURCES
=
\
adler32.c
\
adler32.c
\
compress.c
\
compress.c
\
crc32.c
\
crc32.c
\
...
...
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