From patchwork Tue Sep  9 20:58:10 2008
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: MARS: fix makefile kernel lib build order
From: Yuji Mano <yuji.mano@am.sony.com>
X-Patchwork-Id: 224
Message-Id: <48C6E362.7070007@am.sony.com>
To: CBE Development <cbe-oss-dev@ozlabs.org>
Date: Tue, 9 Sep 2008 13:58:10 -0700

This fixes a bug in the Makefile that would build the kernel before the lib
which the kernel is dependent on.

This also makes sure the kernel links the lib in the build source and not just
any libmars.a it finds in the library search path.

Signed-off-by: Yuji Mano <yuji.mano@am.sony.com>

--- a/src/mpu/Makefile.am
+++ b/src/mpu/Makefile.am
@@ -36,7 +36,7 @@
 #  LIBRARY OR THE USE OR OTHER DEALINGS IN THE LIBRARY.
 #
 
-SUBDIRS = kernel lib
+SUBDIRS = lib kernel
 
 EXTRA_DIST = \
 	bootstrap \
--- a/src/mpu/kernel/Makefile.am
+++ b/src/mpu/kernel/Makefile.am
@@ -54,13 +54,12 @@ mars_kernel_CFLAGS = \
 	-Wmissing-declarations
 
 mars_kernel_LDFLAGS = \
-	-L../lib \
 	-Wl,--defsym=__stack=0x0fff0 \
 	-Wl,-gc-sections \
 	-Wl,-N \
 	-Wl,-s
 
-mars_kernel_LDADD = -lmars
+mars_kernel_LDADD = $(srcdir)/../lib/libmars.a
 
 mars_kernel_SOURCES = \
 	mars_kernel.c \