[4.0] 97023ef streamline AM_CPPFLAGS to include from the builddir

[Nils Goroll]

commit 97023ef179a09d5680312d6c46607cde55aac7a1
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon May 5 18:31:18 2014 +0200

    streamline AM_CPPFLAGS to include from the builddir

diff --git a/bin/varnishadm/Makefile.am b/bin/varnishadm/Makefile.am
index ba476d6..9033e08 100644
--- a/bin/varnishadm/Makefile.am
+++ b/bin/varnishadm/Makefile.am
@@ -1,6 +1,8 @@
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 
 bin_PROGRAMS = varnishadm
 
diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index 748721b..5904430 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -1,6 +1,8 @@
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 
 bin_PROGRAMS = varnishhist
 
diff --git a/bin/varnishlog/Makefile.am b/bin/varnishlog/Makefile.am
index 1e6fa79..2df9415 100644
--- a/bin/varnishlog/Makefile.am
+++ b/bin/varnishlog/Makefile.am
@@ -1,6 +1,8 @@
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 
 bin_PROGRAMS = varnishlog
 
diff --git a/bin/varnishncsa/Makefile.am b/bin/varnishncsa/Makefile.am
index 12a3f4d..d63df61 100644
--- a/bin/varnishncsa/Makefile.am
+++ b/bin/varnishncsa/Makefile.am
@@ -1,6 +1,8 @@
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 
 bin_PROGRAMS = varnishncsa
 
diff --git a/bin/varnishreplay/Makefile.am b/bin/varnishreplay/Makefile.am
index 78fed42..38d1c30 100644
--- a/bin/varnishreplay/Makefile.am
+++ b/bin/varnishreplay/Makefile.am
@@ -1,6 +1,8 @@
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 
 bin_PROGRAMS = varnishreplay
 
diff --git a/bin/varnishstat/Makefile.am b/bin/varnishstat/Makefile.am
index 5c55bab..664131d 100644
--- a/bin/varnishstat/Makefile.am
+++ b/bin/varnishstat/Makefile.am
@@ -1,6 +1,8 @@
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 
 bin_PROGRAMS = varnishstat
 
diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index 5af8068..fe599d4 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -15,7 +15,10 @@ check-local:
 
 DISTCLEANFILES = _.ok
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libvgz
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/lib/libvgz
 
 bin_PROGRAMS =	varnishtest
 
diff --git a/bin/varnishtop/Makefile.am b/bin/varnishtop/Makefile.am
index b919dba..f48e972 100644
--- a/bin/varnishtop/Makefile.am
+++ b/bin/varnishtop/Makefile.am
@@ -1,6 +1,8 @@
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 
 bin_PROGRAMS = varnishtop
 
diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index 5503f86..9275fd2 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PCRE_CFLAGS@
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	@PCRE_CFLAGS@
 
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
diff --git a/lib/libvarnishapi/Makefile.am b/lib/libvarnishapi/Makefile.am
index 1ee44dd..287472b 100644
--- a/lib/libvarnishapi/Makefile.am
+++ b/lib/libvarnishapi/Makefile.am
@@ -2,7 +2,10 @@
 
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @PCRE_CFLAGS@
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	@PCRE_CFLAGS@
 
 lib_LTLIBRARIES = libvarnishapi.la
 
diff --git a/lib/libvarnishcompat/Makefile.am b/lib/libvarnishcompat/Makefile.am
index 543fbb2..78683c0 100644
--- a/lib/libvarnishcompat/Makefile.am
+++ b/lib/libvarnishcompat/Makefile.am
@@ -1,6 +1,9 @@
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
+
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
 pkglib_LTLIBRARIES = libvarnishcompat.la
diff --git a/lib/libvcc/Makefile.am b/lib/libvcc/Makefile.am
index b030dc4..c7e183d 100644
--- a/lib/libvcc/Makefile.am
+++ b/lib/libvcc/Makefile.am
@@ -2,7 +2,9 @@
 
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 
 pkglib_LTLIBRARIES = libvcc.la