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
de40d3ee
Commit
de40d3ee
authored
Nov 08, 2014
by
Federico G. Schwindt
Committed by
Lasse Karstensen
Jan 22, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Install _all_ headers under ${prefix}/include/..
Fixes #1616 Conflicts: bin/varnishd/Makefile.am varnish.m4
parent
d4152ea1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
28 deletions
+21
-28
Makefile.am
bin/varnishd/Makefile.am
+2
-4
Makefile.am
include/Makefile.am
+18
-19
varnish.m4
varnish.m4
+1
-2
varnishapi-uninstalled.pc.in
varnishapi-uninstalled.pc.in
+0
-1
varnishapi.pc.in
varnishapi.pc.in
+0
-2
No files found.
bin/varnishd/Makefile.am
View file @
de40d3ee
...
...
@@ -87,10 +87,9 @@ varnishd_SOURCES = \
waiter/cache_waiter_ports.c
noinst_HEADERS
=
\
cache/cache_backend
.h
\
builtin_vcl
.h
\
cache/cache_esi.h
\
common/heritage.h
\
builtin_vcl.h
\
hash
/hash_slinger.h
\
mgt/mgt.h
\
mgt/mgt_cli.h
\
...
...
@@ -100,8 +99,7 @@ noinst_HEADERS = \
waiter/waiter.h
# Headers for use with vmods
pkgdataincludedir
=
$(pkgdatadir)
/include
nobase_pkgdatainclude_HEADERS
=
\
nobase_pkginclude_HEADERS
=
\
cache/cache.h
\
cache/cache_backend.h
\
common/common.h
\
...
...
include/Makefile.am
View file @
de40d3ee
...
...
@@ -37,6 +37,24 @@ nobase_pkginclude_HEADERS = \
vapi/vapi_options.h
\
vcli.h
# Headers for use with vmods
nobase_pkginclude_HEADERS
+=
\
miniobj.h
\
vas.h
\
vav.h
\
vbm.h
\
vcl.h
\
vcs.h
\
vmod_abi.h
\
vqueue.h
\
vre.h
\
vdef.h
\
vrt.h
\
vrt_obj.h
\
vsa.h
\
vsb.h
\
vsha256.h
# Private headers
nobase_noinst_HEADERS
=
\
binary_heap.h
\
...
...
@@ -68,25 +86,6 @@ nobase_noinst_HEADERS = \
vut.h
\
vut_options.h
# Headers for use with vmods
pkgdataincludedir
=
$(pkgdatadir)
/include
nobase_pkgdatainclude_HEADERS
=
\
miniobj.h
\
vas.h
\
vav.h
\
vbm.h
\
vcl.h
\
vcs.h
\
vmod_abi.h
\
vqueue.h
\
vre.h
\
vdef.h
\
vrt.h
\
vrt_obj.h
\
vsa.h
\
vsb.h
\
vsha256.h
tbl/vrt_stv_var.h tbl/vcl_returns.h tbl/vcc_types.h vcl.h vrt_obj.h
:
$(top_srcdir)/lib/libvcc/generate.py $(top_srcdir)/include/vrt.h
mkdir
-p
tbl
@
PYTHON@
$(top_srcdir)
/lib/libvcc/generate.py
$(top_srcdir)
$(top_builddir)
...
...
varnish.m4
View file @
de40d3ee
...
...
@@ -58,10 +58,9 @@ variable if you installed software in a non-standard prefix.])
fi
])
VARNISH_PKG_GET_VAR([VMOD_INCLUDE_DIR], [vmodincludedir])
VARNISH_PKG_GET_VAR([VAPI_INCLUDE_DIR], [pkgincludedir])
_CPPFLAGS="$CPPFLAGS"
VMOD_INCLUDES="-I$V
MOD_INCLUDE_DIR -I$V
API_INCLUDE_DIR"
VMOD_INCLUDES="-I$VAPI_INCLUDE_DIR"
CPPFLAGS="$VMOD_INCLUDES $CPPFLAGS"
AC_CHECK_HEADERS([vsha256.h cache/cache.h])
CPPFLAGS="$_CPPFLAGS"
...
...
varnishapi-uninstalled.pc.in
View file @
de40d3ee
...
...
@@ -8,7 +8,6 @@ pkgincludedir=${includedir}/@PACKAGE@
datarootdir=@datarootdir@
datadir=@datadir@
pkgdatadir=${datadir}/@PACKAGE@
pkgdataincludedir=${pkgdatadir}/include
vmoddir=${libdir}/@PACKAGE@/vmods
builddir=@abs_top_builddir@
srcdir=@abs_top_srcdir@
...
...
varnishapi.pc.in
View file @
de40d3ee
...
...
@@ -8,8 +8,6 @@ pkgincludedir=${includedir}/@PACKAGE@
datarootdir=@datarootdir@
datadir=@datadir@
pkgdatadir=${datadir}/@PACKAGE@
pkgdataincludedir=${pkgdatadir}/include
vmodincludedir=${pkgdataincludedir}
vmoddir=${libdir}/@PACKAGE@/vmods
vmodtool=${pkgdatadir}/vmodtool.py
...
...
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