From df0cc5d42c6b6ce77b28b19415a2d25e41fb0b97 Mon Sep 17 00:00:00 2001
From: Pixel <pixel@nobis-crew.org>
Date: Sat, 5 Feb 2011 14:48:24 -0800
Subject: Adding library acorn, with malloc wrapping.

---
 Makefile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6a4f3d4..b1294f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 TARGET = demo.bin
-LIBDEPS = FreeRTOS/libFreeRTOS.a arch/libarch.a os/libos.a libc/libc.a libm/libm.a
+LIBDEPS = FreeRTOS/libFreeRTOS.a arch/libarch.a os/libos.a libc/libc.a libm/libm.a acorn/libacorn.a
 LIBS = -Wl,--start-group $(LIBDEPS) -Wl,--end-group
 
 TARGET_SRCS = test-romfs.o
@@ -16,18 +16,20 @@ clean: clean-generic
 	$(Q)$(MAKE) $(MAKE_OPTS) -C os clean
 	$(Q)$(MAKE) $(MAKE_OPTS) -C libc clean
 	$(Q)$(MAKE) $(MAKE_OPTS) -C libm clean
+	$(Q)$(MAKE) $(MAKE_OPTS) -C acorn clean
 	$(Q)$(MAKE) $(MAKE_OPTS) -C tools clean
 	$(Q)rm -f test-romfs.bin
 
-.PHONY: libs FreeRTOS arch os libc libm tools deps
+.PHONY: libs FreeRTOS arch os libc libm acorn tools deps
 
 FreeRTOS/libFreeRTOS.a: FreeRTOS
 arch/libarch.a: arch
 os/libos.a: os
 libc/libc.a: libc
-libm/libm/a: libm
+libm/libm.a: libm
+acorn/libacorn.a: acorn
 
-libs: FreeRTOS arch os libc libm
+libs: FreeRTOS arch os libc libm acorn
 
 FreeRTOS:
 	$(E) "[MAKE]   Entering FreeRTOS"
@@ -49,6 +51,10 @@ libm:
 	$(E) "[MAKE]   Entering libm"
 	$(Q)$(MAKE) $(MAKE_OPTS) -C libm
 
+acorn:
+	$(E) "[MAKE]   Entering acorn"
+	$(Q)$(MAKE) $(MAKE_OPTS) -C acorn
+
 tools:
 	$(E) "[MAKE]   Entering tools"
 	$(Q)$(MAKE) $(MAKE_OPTS) -C tools
@@ -70,6 +76,8 @@ deps: ldeps
 	$(Q)$(MAKE) $(MAKE_OPTS) -C libc ldeps
 	$(E) "[DEPS]   Creating dependency tree for libm"
 	$(Q)$(MAKE) $(MAKE_OPTS) -C libm ldeps
+	$(E) "[DEPS]   Creating dependency tree for acorn"
+	$(Q)$(MAKE) $(MAKE_OPTS) -C acorn ldeps
 
 include FreeRTOS/config.mk
 include arch/config.mk
-- 
cgit v1.2.3