[Cbe-oss-dev] [PATCH 3/7]MARS/task: Add search paths

[Yuji Mano]

From: Kazunori Asayama <asayama at sm.sony.co.jp>

Add search paths to task module's Makefiles

This patch adds search paths to task module's Makefiles so the build
system can build both of base and task module without installing base.

Signed-off-by: Kazunori Asayama <asayama at sm.sony.co.jp>
---
 task/src/host/lib/Makefile.am   |    6 +++++-
 task/src/mpu/lib/Makefile.am    |    5 ++++-
 task/src/mpu/module/Makefile.am |    6 +++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

Index: b/task/src/host/lib/Makefile.am
===================================================================
--- a/task/src/host/lib/Makefile.am	2009-01-07 17:59:55.000000000 +0900
+++ b/task/src/host/lib/Makefile.am	2009-01-07 18:06:23.000000000 +0900
@@ -73,7 +73,10 @@ AM_CPPFLAGS = \
 	$(extra_cppflags) \
 	-I$(srcdir)/../../../include/common \
 	-I$(srcdir)/../../../include/host \
-	-I$(srcdir)/../../../src/common
+	-I$(srcdir)/../../../src/common \
+	-I$(builddir)/../../../../base/include/host \
+	-I$(srcdir)/../../../../base/include/common \
+	-I$(srcdir)/../../../../base/include/host
 
 AM_CFLAGS = \
 	$(extra_cflags) \
@@ -120,6 +123,7 @@ mars_task_module.c: ${MARS_TASK_MODULE}
 
 libmars_task_la_LDFLAGS = \
 	-version-info 1:0:0 \
+	-Wl,-L$(builddir)/../../../../base/src/host/lib/.libs \
 	-Wl,-Map -Wl,$@.map -Wl,--cref \
 	-Wl,-lmars_base
 
Index: b/task/src/mpu/lib/Makefile.am
===================================================================
--- a/task/src/mpu/lib/Makefile.am	2009-01-07 17:59:55.000000000 +0900
+++ b/task/src/mpu/lib/Makefile.am	2009-01-07 18:06:23.000000000 +0900
@@ -72,7 +72,10 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/../../../include/common \
 	-I$(srcdir)/../../../include/mpu \
 	-I$(srcdir)/../../../src/common \
-	-I$(srcdir)/../../../src/mpu/module
+	-I$(srcdir)/../../../src/mpu/module \
+	-I$(builddir)/../../../../base/include/mpu \
+	-I$(srcdir)/../../../../base/include/common \
+	-I$(srcdir)/../../../../base/include/mpu
 
 AM_CFLAGS = \
 	$(extra_cflags) \
Index: b/task/src/mpu/module/Makefile.am
===================================================================
--- a/task/src/mpu/module/Makefile.am	2009-01-07 17:59:55.000000000 +0900
+++ b/task/src/mpu/module/Makefile.am	2009-01-07 18:06:23.000000000 +0900
@@ -64,7 +64,10 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/../../../include/common \
 	-I$(srcdir)/../../../include/mpu \
 	-I$(srcdir)/../../../src/common \
-	-I$(srcdir)/../../../src/mpu/lib
+	-I$(srcdir)/../../../src/mpu/lib \
+	-I$(builddir)/../../../../base/include/mpu \
+	-I$(srcdir)/../../../../base/include/common \
+	-I$(srcdir)/../../../../base/include/mpu
 
 AM_CCASFLAGS = \
 	$(extra_cppflags)
@@ -82,6 +85,7 @@ AM_CFLAGS = \
 
 AM_LDFLAGS = \
 	$(extra_ldflags) \
+	-L$(builddir)/../../../../base/src/mpu/lib/.libs \
 	-Wl,--entry,mars_module_entry -Wl,-u,mars_module_entry \
 	-Wl,-Map -Wl,$@.map -Wl,--cref \
 	-Wl,-gc-sections \