aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazunori Asayama <asayama@sm.sony.co.jp>2009-01-16 12:36:42 -0800
committerYuji Mano <yuji.mano@am.sony.com>2009-01-20 11:47:13 -0800
commitf4eec77a236e1b6dfdb9be44d5e31984e4e1389c (patch)
treea22f63fc7beaf8088c9146071d57455a814d0511
parent8c30c5f0bb1872aec3ec5424864c6f8e8139876f (diff)
downloadmars-src-f4eec77a236e1b6dfdb9be44d5e31984e4e1389c.tar.gz
task: Add search paths
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@sm.sony.co.jp> Signed-off-by: Yuji Mano <yuji.mano@am.sony.com>
-rw-r--r--task/src/host/lib/Makefile.am6
-rw-r--r--task/src/mpu/lib/Makefile.am5
-rw-r--r--task/src/mpu/module/Makefile.am6
3 files changed, 14 insertions, 3 deletions
diff --git a/task/src/host/lib/Makefile.am b/task/src/host/lib/Makefile.am
index b8bba0d..2d57e85 100644
--- a/task/src/host/lib/Makefile.am
+++ b/task/src/host/lib/Makefile.am
@@ -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
diff --git a/task/src/mpu/lib/Makefile.am b/task/src/mpu/lib/Makefile.am
index d6386fa..a9ff458 100644
--- a/task/src/mpu/lib/Makefile.am
+++ b/task/src/mpu/lib/Makefile.am
@@ -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) \
diff --git a/task/src/mpu/module/Makefile.am b/task/src/mpu/module/Makefile.am
index 92d9db6..15cbc7b 100644
--- a/task/src/mpu/module/Makefile.am
+++ b/task/src/mpu/module/Makefile.am
@@ -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 \