[cpp-xmltooling] 03/05: Use strictly proper include directories to fix out of tree builds

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=90efa4834f09929e0cd46b153c9561b23eb42312

commit 90efa4834f09929e0cd46b153c9561b23eb42312
Author: Ferenc Wágner <wferi at debian.org>
AuthorDate: Mon Jun 25 20:05:13 2018 +0200

    Use strictly proper include directories to fix out of tree builds
---
 Makefile.am                | 1 -
 configure.ac               | 2 +-
 doc/Makefile.am            | 2 --
 schemas/Makefile.am        | 2 --
 xmltooling/Makefile.am     | 2 +-
 xmltoolingtest/Makefile.am | 2 +-
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cf78b60..d3022da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS = foreign dist-zip dist-bzip2
 ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
diff --git a/configure.ac b/configure.ac
index 91c45ec..39785c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([xmltooling],[3.0.0],[https://issues.shibboleth.net/],[xmltooling])
 AC_CONFIG_SRCDIR(xmltooling)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-zip subdir-objects nostdinc])
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 PKG_INSTALLDIR
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fa84046..2173b82 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign
-
 pkgdocdir = $(datadir)/doc/@PACKAGE at -@PACKAGE_VERSION@
 
 install-data-hook:
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 3b9c00c..0473b4b 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = foreign
-
 schemafiles = \
 	soap-envelope.xsd \
 	xenc-schema.xsd \
diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 02e6250..038e139 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = foreign subdir-objects
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(srcdir)
 
 if BUILD_XMLSEC
 lib_LTLIBRARIES = libxmltooling-lite.la libxmltooling.la
diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index cbdcaad..6607fc2 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 TESTS = xmltoolingtest
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.