[PATCH 1/3] Fix include and lib dirs for srcdir != builddir builds

[Jeremy Kerr]

We need a couple of fixes to find headers and built libs.

Signed-off-by: Jeremy Kerr <jk at ozlabs.org>

---
 src/Makefile.am         |    4 ++--
 src/acpica/Makefile.am  |    4 ++--
 src/lib/src/Makefile.am |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 155cba1..492eb46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,7 +94,7 @@ fwts_SOURCES = main.c 				\
 fwts_LDFLAGS = -lm
 
 fwts_LDADD = \
-	-Llib/src -lfwts \
-	-L$(top_srcdir)/src/acpica -lfwtsacpica
+	-L$(top_builddir)/src/acpica -lfwtsacpica \
+	-Llib/src -lfwts
 
 man_MANS = ../doc/fwts.1 ../doc/fwts-collect.1 ../doc/fwts-frontend-text.1
diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am
index 0937ce3..d6e176d 100644
--- a/src/acpica/Makefile.am
+++ b/src/acpica/Makefile.am
@@ -7,7 +7,7 @@
 AM_CPPFLAGS = 						\
 	-D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP	\
 	-I$(top_srcdir)/src/lib/include			\
-	-Isource/include				\
+	-I$(srcdir)/source/include			\
 	-Wall -fno-strict-aliasing
 
 #
@@ -241,5 +241,5 @@ libfwtsacpica_la_SOURCES =				\
 	source/tools/acpiexec/aehandlers.c
 
 libfwtsacpica_la_LIBADD = \
-	-L$(top_srcdir)/src/lib/src -lfwts -lrt
+	-L$(top_builddir)/src/lib/src -lfwts -lrt
 
diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
index 377e8aa..d004236 100644
--- a/src/lib/src/Makefile.am
+++ b/src/lib/src/Makefile.am
@@ -9,7 +9,7 @@ pkglib_LTLIBRARIES = libfwts.la
 libfwts_la_LDFLAGS = 			\
 	-lm -lpcre -lpthread 		\
 	-version-info 1:0:0 		\
-	-L$(top_srcdir)/src/acpica/source/compiler \
+	-L$(top_builddir)/src/acpica/source/compiler \
 	-lfwtsiasl
 
 libfwts_la_CPPFLAGS = $(AM_CPPFLAGS)