summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extra/Makefile.am5
-rw-r--r--lib/Makefile.am5
-rw-r--r--lib/accelerated/Makefile.am1
-rw-r--r--lib/accelerated/x86/Makefile.am1
-rw-r--r--lib/algorithms/Makefile.am1
-rw-r--r--lib/auth/Makefile.am1
-rw-r--r--lib/ext/Makefile.am1
-rw-r--r--lib/nettle/Makefile.am1
-rw-r--r--lib/opencdk/Makefile.am1
-rw-r--r--lib/openpgp/Makefile.am1
-rw-r--r--src/Makefile.am1
11 files changed, 17 insertions, 2 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am
index 7893244ddc..cfcdbd5719 100644
--- 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 37e6e5b568..1edaa5e61f 100644
--- 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 081a5f9aa7..37acd47cff 100644
--- 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 9d5225bd60..906532731e 100644
--- 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 99a190832d..e4d62eec8b 100644
--- 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 bb19210510..1bf965b4b5 100644
--- 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 471fe92d6e..a2adcca7a5 100644
--- 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 6c4c5f8ee3..86afffc4f9 100644
--- 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 06befe8b3f..9622e2fa33 100644
--- 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 1c4d101d08..4d06564d07 100644
--- 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 bd7d10df20..cbde1cde0e 100644
--- 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 \
View Lorry Controller Status