diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-20 19:30:39 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-20 19:30:39 +0000 |
| commit | f6f8f750c7a25d123dc6f20902b38bcda1c95963 (patch) | |
| tree | 8bc941e79fba3ba910bab14fc05227bdd88d3239 /nuttx/Makefile | |
| parent | eafaeb9398216dacb92de69683ccdda6007efb1d (diff) | |
| download | px4-nuttx-f6f8f750c7a25d123dc6f20902b38bcda1c95963.tar.gz px4-nuttx-f6f8f750c7a25d123dc6f20902b38bcda1c95963.tar.bz2 px4-nuttx-f6f8f750c7a25d123dc6f20902b38bcda1c95963.zip | |
More build fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3406 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
| -rw-r--r-- | nuttx/Makefile | 17 |
1 files changed, 14 insertions, 3 deletions
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 + |