From 758d4800642060f50cdf26f7063c9825ea635d15 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 3 Apr 2011 20:41:49 +0000
Subject: Move memory manager into user space

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3460 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/Makefile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'nuttx/Makefile')

diff --git a/nuttx/Makefile b/nuttx/Makefile
index 88ccec36d..30e92e135 100644
--- a/nuttx/Makefile
+++ b/nuttx/Makefile
@@ -106,7 +106,7 @@ endif
 # USERDIRS - When NuttX is build is a monolithic kernel, this provides the
 #   list of directories that must be built
 
-NONFSDIRS	= sched $(ARCH_SRC) mm $(NUTTX_ADDONS)
+NONFSDIRS	= sched $(ARCH_SRC) $(NUTTX_ADDONS)
 FSDIRS		= fs drivers binfmt
 NETFSDIRS	= fs drivers
 CONTEXTDIRS	= $(APPDIR)
@@ -115,9 +115,9 @@ USERDIRS	=
 ifeq ($(CONFIG_NUTTX_KERNEL),y)
 NONFSDIRS	+= syscall
 CONTEXTDIRS	+= syscall
-USERDIRS	+= syscall lib $(USER_ADDONS)
+USERDIRS	+= syscall lib mm $(USER_ADDONS)
 else
-NONFSDIRS	+= lib
+NONFSDIRS	+= lib mm
 endif
 
 ifeq ($(CONFIG_NX),y)
@@ -175,16 +175,18 @@ endif
 # USERLIBS is the list of libraries used to build the final user-space
 #   application
 
-NUTTXLIBS	= sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) mm/libmm$(LIBEXT) \
-		  lib/liblib$(LIBEXT)
+NUTTXLIBS	= sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) lib/liblib$(LIBEXT)
 USERLIBS	=
 
 # Add libraries for syscall support.  The C library will be needed by
-# both the kernel- and user-space builds.
+# both the kernel- and user-space builds.  For now, the memory manager (mm)
+# is placed in user space (only).
 
 ifeq ($(CONFIG_NUTTX_KERNEL),y)
 NUTTXLIBS	+= syscall/libstubs$(LIBEXT)
-USERLIBS	+= syscall/libproxies$(LIBEXT) lib/liblib$(LIBEXT)
+USERLIBS	+= syscall/libproxies$(LIBEXT) lib/liblib$(LIBEXT) mm/libmm$(LIBEXT)
+else
+NUTTXLIBS	+= mm/libmm$(LIBEXT)
 endif
 
 # Add libraries for network support.  CXX, CXXFLAGS, and COMPILEXX must
@@ -332,11 +334,6 @@ graphics/libgraphics$(LIBEXT): context
 syscall/libstubs$(LIBEXT): context
 	@$(MAKE) -C syscall TOPDIR="$(TOPDIR)" libstubs$(LIBEXT) EXTRADEFINES=$(KDEFINE)
 
-# Still need to think about this one
-
-mm/libmm$(LIBEXT): context
-	@$(MAKE) -C mm TOPDIR="$(TOPDIR)" libmm$(LIBEXT)
-
 # Possible user-mode builds
 
 lib/liblib$(LIBEXT): context
@@ -345,6 +342,9 @@ lib/liblib$(LIBEXT): context
 libxx/liblibxx$(LIBEXT): context
 	@$(MAKE) -C libxx TOPDIR="$(TOPDIR)" liblibxx$(LIBEXT)
 
+mm/libmm$(LIBEXT): context
+	@$(MAKE) -C mm TOPDIR="$(TOPDIR)" libmm$(LIBEXT) EXTRADEFINES=$(KDEFINE)
+
 $(APPDIR)/libapps$(LIBEXT): context
 	@$(MAKE) -C $(APPDIR) TOPDIR="$(TOPDIR)" libapps$(LIBEXT)
 
-- 
cgit v1.2.3