Permalink
Browse files

Install _all_ headers under ${prefix}/include/..

Fixes #1616
  • Loading branch information...
1 parent 1767f1b commit 61cdf24bb88a18d175c8b6e1c4dc26593728fa27 @fgsch fgsch committed Nov 8, 2014
Showing with 23 additions and 31 deletions.
  1. +2 −5 bin/varnishd/Makefile.am
  2. +18 −19 include/Makefile.am
  3. +3 −4 varnish.m4
  4. +0 −1 varnishapi-uninstalled.pc.in
  5. +0 −2 varnishapi.pc.in
@@ -92,11 +92,9 @@ varnishd_SOURCES = \
waiter/cache_waiter_ports.c
noinst_HEADERS = \
- cache/cache_backend.h \
- cache/cache_director.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 \
@@ -106,8 +104,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_filter.h \
cache/cache_backend.h \
View
@@ -38,6 +38,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)
View
@@ -1,7 +1,7 @@
# varnish.m4 - Macros to locate Varnish header files. -*- Autoconf -*-
-# serial 1 (varnish-4.0)
+# serial 2 (varnish-4.0)
-# Copyright (c) 2013 Varnish Software AS
+# Copyright (c) 2013-2014 Varnish Software AS
# All rights reserved.
#
# Author: Tollef Fog Heen <tfheen@varnish-software.com>
@@ -53,10 +53,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$VMOD_INCLUDE_DIR -I$VAPI_INCLUDE_DIR"
+VMOD_INCLUDES="-I$VAPI_INCLUDE_DIR"
CPPFLAGS="$VMOD_INCLUDES $CPPFLAGS"
AC_CHECK_HEADERS([vsha256.h cache/cache.h])
CPPFLAGS="$_CPPFLAGS"
@@ -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@
View
@@ -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

0 comments on commit 61cdf24

Please sign in to comment.