Pass __KERNEL__ define (or not) to all makes to handle small differences in user-/kernel-builds

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3459 7fd9a85b-ad96-42d3-883c-3090e2eb8679

1 files changed, 35 insertions, 24 deletions

diff --git a/nuttx/Makefile b/nuttx/Makefile
index ec2437f8ad..88ccec36d3 100644
--- a/nuttx/Makefile
+++ b/nuttx/Makefile
@@ -52,6 +52,11 @@ else
   NUTTX		= $(TOPDIR)/nuttx
 endif
 
+# This define is passed as EXTRADEFINES for kernel-mode builds.  It is also passed
+# during PASS1 (but not PASS2) context and depend targets.
+
+KDEFINE		= ${shell $(TOPDIR)/tools/define.sh $(CC) __KERNEL__}
+
 # Process architecture and board-specific directories
 
 ARCH_DIR	= arch/$(CONFIG_ARCH)
@@ -280,7 +285,7 @@ dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(
 
 context: check_context include/nuttx/config.h dirlinks
 	@for dir in $(CONTEXTDIRS) ; do \
-		$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" context ; \
+		$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" context; \
 	done
 
 clean_context:
@@ -298,44 +303,50 @@ check_context:
 		exit 1 ; \
 	fi
 
-sched/libsched$(LIBEXT): context
-	@$(MAKE) -C sched TOPDIR="$(TOPDIR)" libsched$(LIBEXT)
-
-lib/liblib$(LIBEXT): context
-	@$(MAKE) -C lib TOPDIR="$(TOPDIR)" liblib$(LIBEXT)
+# Possible kernel-mode builds
 
-libxx/liblibxx$(LIBEXT): context
-	@$(MAKE) -C libxx TOPDIR="$(TOPDIR)" liblibxx$(LIBEXT)
+sched/libsched$(LIBEXT): context
+	@$(MAKE) -C sched TOPDIR="$(TOPDIR)" libsched$(LIBEXT) EXTRADEFINES=$(KDEFINE)
 
 $(ARCH_SRC)/libarch$(LIBEXT): context
-	@$(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libarch$(LIBEXT)
-
-mm/libmm$(LIBEXT): context
-	@$(MAKE) -C mm TOPDIR="$(TOPDIR)" libmm$(LIBEXT)
+	@$(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) EXTRADEFINES=$(KDEFINE)
 
 net/libnet$(LIBEXT): context
-	@$(MAKE) -C net TOPDIR="$(TOPDIR)" libnet$(LIBEXT)
+	@$(MAKE) -C net TOPDIR="$(TOPDIR)" libnet$(LIBEXT) EXTRADEFINES=$(KDEFINE)
 
 fs/libfs$(LIBEXT): context
-	@$(MAKE) -C fs TOPDIR="$(TOPDIR)" libfs$(LIBEXT)
+	@$(MAKE) -C fs TOPDIR="$(TOPDIR)" libfs$(LIBEXT) EXTRADEFINES=$(KDEFINE)
 
 drivers/libdrivers$(LIBEXT): context
-	@$(MAKE) -C drivers TOPDIR="$(TOPDIR)" libdrivers$(LIBEXT)
-
-$(APPDIR)/libapps$(LIBEXT): context
-	@$(MAKE) -C $(APPDIR) TOPDIR="$(TOPDIR)" libapps$(LIBEXT)
+	@$(MAKE) -C drivers TOPDIR="$(TOPDIR)" libdrivers$(LIBEXT) EXTRADEFINES=$(KDEFINE)
 
 binfmt/libbinfmt$(LIBEXT): context
-	@$(MAKE) -C binfmt TOPDIR="$(TOPDIR)" libbinfmt$(LIBEXT)
+	@$(MAKE) -C binfmt TOPDIR="$(TOPDIR)" libbinfmt$(LIBEXT) EXTRADEFINES=$(KDEFINE)
 
 pcode/libpcode$(LIBEXT): context
-	@$(MAKE) -C pcode TOPDIR="$(TOPDIR)" libpcode$(LIBEXT)
+	@$(MAKE) -C pcode TOPDIR="$(TOPDIR)" libpcode$(LIBEXT) EXTRADEFINES=$(KDEFINE)
 
 graphics/libgraphics$(LIBEXT): context
-	@$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT)
+	@$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT) EXTRADEFINES=$(KDEFINE)
 
 syscall/libstubs$(LIBEXT): context
-	@$(MAKE) -C syscall TOPDIR="$(TOPDIR)" libstubs$(LIBEXT)
+	@$(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
+	@$(MAKE) -C lib TOPDIR="$(TOPDIR)" liblib$(LIBEXT)
+
+libxx/liblibxx$(LIBEXT): context
+	@$(MAKE) -C libxx TOPDIR="$(TOPDIR)" liblibxx$(LIBEXT)
+
+$(APPDIR)/libapps$(LIBEXT): context
+	@$(MAKE) -C $(APPDIR) TOPDIR="$(TOPDIR)" libapps$(LIBEXT)
 
 syscall/libproxies$(LIBEXT): context
 	@$(MAKE) -C syscall TOPDIR="$(TOPDIR)" libproxies$(LIBEXT)
@@ -370,7 +381,7 @@ endif
 pass2deps: context pass2dep $(NUTTXLIBS)
 
 pass2: pass2deps
-	@$(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" EXTRA_OBJS="$(EXTRA_OBJS)" LINKLIBS="$(NUTTXLIBS)" $(BIN)
+	@$(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" EXTRA_OBJS="$(EXTRA_OBJS)" LINKLIBS="$(NUTTXLIBS)" EXTRADEFINES=$(KDEFINE) $(BIN)
 	@if [ -w /tftpboot ] ; then \
 		cp -f $(TOPDIR)/$@ /tftpboot/$@.${CONFIG_ARCH}; \
 	fi
@@ -411,7 +422,7 @@ pass1dep: context
 
 pass2dep: context
 	@for dir in $(KERNDEPDIRS) ; do \
-		$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" depend ; \
+		$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" EXTRADEFINES=$(KDEFINE) depend; \
 	done
 
 depend: pass1dep pass2dep