more builddir fixes by David Hoyt.

diff --git a/extra/Makefile.am b/extra/Makefile.am
index 7893244ddcb32be737fd3c4c3e782c49ef8f51b5..cfcdbd5719b2777519585a4bb61959b317b50f1c 100644 (file)
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -26,10 +26,13 @@ ACLOCAL_AMFLAGS = -I ../m4 -I ../gl/m4
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = \
        -I$(srcdir)/../gl                       \
+       -I$(builddir)/../gl                     \
        -I$(builddir)/../lib/includes   \
        -I$(srcdir)/../lib/includes     \
        -I$(srcdir)/includes            \
-       -I$(srcdir)/../lib
+       -I$(builddir)/includes          \
+       -I$(srcdir)/../lib              \
+       -I$(builddir)/../lib
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(srcdir)/../lib/minitasn1

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 37e6e5b5689b83b5f4159679c108a3151079593a..1edaa5e61ff212bbbc0db3a7b6c663cd17b2779e 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -35,6 +35,7 @@ AM_CPPFLAGS = \
        -I$(builddir)/includes                  \
        -I$(builddir)/x509                      \
        -I$(srcdir)/includes                    \
+       -I$(builddir)/includes                  \
        -I$(srcdir)/x509
 
 if ENABLE_OPENPGP
@@ -154,7 +155,9 @@ endif
 if ENABLE_CXX
 libgnutlsxx_la_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_builddir)/includes -I$(srcdir)/includes
 
-AM_CXXFLAGS = -I$(srcdir)/includes
+AM_CXXFLAGS = \
+       -I$(srcdir)/includes    \
+       -I$(builddir)/includes  
 
 lib_LTLIBRARIES += libgnutlsxx.la
 

diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index 081a5f9aa720c62ceed3c6212c6b247dd1e494b9..37acd47cffa1b1dc3a9cd900452eb0bb7fb75dc6 100644 (file)
--- a/lib/accelerated/Makefile.am
+++ b/lib/accelerated/Makefile.am
@@ -22,6 +22,7 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
 SUBDIRS = 
 AM_CPPFLAGS = \
        -I$(srcdir)/../../gl            \
+       -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \
        -I$(builddir)/../../gl          \
        -I$(builddir)/../includes       \

diff --git a/lib/accelerated/x86/Makefile.am b/lib/accelerated/x86/Makefile.am
index 9d5225bd608a09a7df29e0f49e6180beb3d09d8d..906532731efa9c9c829b422e977bd88510717c26 100644 (file)
--- a/lib/accelerated/x86/Makefile.am
+++ b/lib/accelerated/x86/Makefile.am
@@ -22,6 +22,7 @@ AM_LIBTOOLFLAGS=--tag=CC
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = \
        -I$(srcdir)/../../../gl         \
+       -I$(builddir)/../../../gl               \
        -I$(srcdir)/../../includes      \
        -I$(builddir)/../../includes    \
        -I$(srcdir)/../../ \

diff --git a/lib/algorithms/Makefile.am b/lib/algorithms/Makefile.am
index 99a190832d217ae614d7c11804ef0564fa926c6a..e4d62eec8b4e846601f65fb22da033187cbb6569 100644 (file)
--- a/lib/algorithms/Makefile.am
+++ b/lib/algorithms/Makefile.am
@@ -21,6 +21,7 @@
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = \
        -I$(srcdir)/../../gl            \
+       -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \
        -I$(builddir)/../includes       \
        -I$(builddir)/../../gl          \

diff --git a/lib/auth/Makefile.am b/lib/auth/Makefile.am
index bb19210510f752b6a466886061cf661cc4f2d376..1bf965b4b5bfce236e06ff30b5c19ba48151e303 100644 (file)
--- a/lib/auth/Makefile.am
+++ b/lib/auth/Makefile.am
@@ -21,6 +21,7 @@
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = \
        -I$(srcdir)/../../gl            \
+       -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \
        -I$(builddir)/../includes       \
        -I$(builddir)/../../gl          \

diff --git a/lib/ext/Makefile.am b/lib/ext/Makefile.am
index 471fe92d6e9493af7a893b0a09d52a3540846d14..a2adcca7a59871bec71db687005c2bb6186a4514 100644 (file)
--- a/lib/ext/Makefile.am
+++ b/lib/ext/Makefile.am
@@ -21,6 +21,7 @@
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = \
        -I$(srcdir)/../../gl            \
+       -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \
        -I$(builddir)/../includes       \
        -I$(builddir)/../../gl          \

diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index 6c4c5f8ee3680fea4023335965b01a7565575b33..86afffc4f95d883e49756102fdf69fd2a007a92d 100644 (file)
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -21,6 +21,7 @@
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = \
        -I$(srcdir)/../../gl            \
+       -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \
        -I$(builddir)/../includes       \
        -I$(builddir)/../../gl          \

diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am
index 06befe8b3fa961a69660297c500867dc63e7e20d..9622e2fa3397abf390a6abcecb8c6e15319f090a 100644 (file)
--- a/lib/opencdk/Makefile.am
+++ b/lib/opencdk/Makefile.am
@@ -20,6 +20,7 @@
 
 AM_CPPFLAGS = \
        -I$(srcdir)/../../gl            \
+       -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \
        -I$(builddir)/../includes       \
        -I$(builddir)/../../gl          \

diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index 1c4d101d083692d926b8170a80c1429a8db8d2ae..4d06564d073f39cccee571601fda8e1d4aad7643 100644 (file)
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -21,6 +21,7 @@
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = \
        -I$(srcdir)/../../gl            \
+       -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \
        -I$(builddir)/../includes       \
        -I$(builddir)/../../gl          \

diff --git a/src/Makefile.am b/src/Makefile.am
index bd7d10df2005dc2a99332f1b7933108d380ae703..cbde1cde0efd22fc96bd87a0d06c9cde9499f25c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,7 @@ endif
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = \
        -I$(srcdir)/../gl                       \
+       -I$(builddir)/../gl                     \
        -I$(builddir)/../lib/includes           \
        -I$(srcdir)/../lib/includes             \
        -I$(srcdir)/../extra/includes   \