From b6ca8b372fea3b096fde4dc6ab3f4000ea3f42b9 Mon Sep 17 00:00:00 2001 From: David Hoyt Date: Fri, 21 Oct 2011 13:03:52 -0700 Subject: [PATCH 1/2] Several fixes for building outside the source tree. --- lib/Makefile.am | 5 ++++- lib/accelerated/Makefile.am | 1 + lib/accelerated/x86/Makefile.am | 1 + lib/algorithms/Makefile.am | 1 + lib/auth/Makefile.am | 1 + lib/ext/Makefile.am | 1 + lib/minitasn1/Makefile.am | 1 + lib/nettle/Makefile.am | 1 + lib/opencdk/Makefile.am | 1 + lib/openpgp/Makefile.am | 1 + 10 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 50569d0..5f56f61 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -33,6 +33,7 @@ AM_CPPFLAGS = \ -I$(srcdir)/../gl \ -I$(builddir)/../gl \ -I$(srcdir)/includes \ + -I$(builddir)/includes \ -I$(srcdir)/x509 if ENABLE_OPENPGP @@ -152,7 +153,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 ce2f836..7363604 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)/../includes \ -I$(srcdir)/.. diff --git a/lib/accelerated/x86/Makefile.am b/lib/accelerated/x86/Makefile.am index 9d5225b..9065327 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 3bf8ae7..8997acb 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$(srcdir)/.. \ diff --git a/lib/auth/Makefile.am b/lib/auth/Makefile.am index e31e95b..51b85a1 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$(srcdir)/.. \ diff --git a/lib/ext/Makefile.am b/lib/ext/Makefile.am index b00a47f..1f7279f 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$(srcdir)/.. \ diff --git a/lib/minitasn1/Makefile.am b/lib/minitasn1/Makefile.am index e5be71b..d448594 100644 --- a/lib/minitasn1/Makefile.am +++ b/lib/minitasn1/Makefile.am @@ -23,6 +23,7 @@ AM_CPPFLAGS = -DASN1_BUILDING \ -I$(srcdir)/../../gl \ + -I$(builddir)/../../gl \ -I$(srcdir)/.. noinst_LTLIBRARIES = libminitasn1.la diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am index a2aadad..c0fbb5e 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$(srcdir)/.. diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am index b2163fe..21cedb6 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$(srcdir)/.. diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am index 9fcd44f..3216ce2 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$(srcdir)/.. \ -- 1.7.4.msysgit.0 From 97ab2650793f40b06ad1d9362b346fb60cbe9ddc Mon Sep 17 00:00:00 2001 From: David Hoyt Date: Fri, 21 Oct 2011 16:36:18 -0700 Subject: [PATCH 2/2] More build fixes. --- extra/Makefile.am | 1 + src/Makefile.am | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/extra/Makefile.am b/extra/Makefile.am index 7893244..0bd09ef 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -26,6 +26,7 @@ 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 \ diff --git a/src/Makefile.am b/src/Makefile.am index bd7d10d..cbde1cd 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 \ -- 1.7.4.msysgit.0