From f6f8f750c7a25d123dc6f20902b38bcda1c95963 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 20 Mar 2011 19:30:39 +0000
Subject: More build fixes

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

(limited to 'nuttx/Makefile')

diff --git a/nuttx/Makefile b/nuttx/Makefile
index 22102a91b..9c20f4f26 100644
--- a/nuttx/Makefile
+++ b/nuttx/Makefile
@@ -80,6 +80,7 @@ ADDON_DIRS	:= $(PCODE_DIR) $(NX_DIR) $(APPDIR)
 
 NONFSDIRS	= sched lib $(ARCH_SRC) mm $(ADDON_DIRS)
 FSDIRS		= fs drivers binfmt
+NETFSDIRS	= fs drivers
 CONTEXTDIRS	=
 
 ifeq ($(CONFIG_NX),y)
@@ -98,17 +99,26 @@ endif
 CLEANDIRS	= $(NONFSDIRS) $(FSDIRS)
 MAKEDIRS	= $(NONFSDIRS)
 
+# Add file system directories to MAKEDIRS (they are already in CLEANDIRS)
+
 ifeq ($(CONFIG_NFILE_DESCRIPTORS),0)
+ifeq ($(CONFIG_NET),y)
 ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0)
 MAKEDIRS	+= fs
 endif
-ifeq ($(CONFIG_NET),y)
-MAKEDIRS	+= net
+MAKEDIRS	+= drivers
 endif
 else
 MAKEDIRS	+= $(FSDIRS)
 endif
 
+# Add networking directories to MAKEDIRS and CLEANDIRS
+
+ifeq ($(CONFIG_NET),y)
+MAKEDIRS	+= net
+endif
+CLEANDIRS	+= net
+
 #
 # Extra objects used in the final link.
 #
@@ -367,7 +377,8 @@ subdir_distclean:
 	done
 
 distclean: clean subdir_distclean clean_context
-	@rm -f Make.defs setenv.sh .config
 ifeq ($(CONFIG_BUILD_2PASS),y)
 	@$(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" distclean
 endif
+	@rm -f Make.defs setenv.sh .config
+
-- 
cgit v1.2.3