diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-30 09:57:44 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-30 09:57:44 -0600 |
commit | 1d19f1a16f4dac43bf0f9b00eca9fa5cb2d60953 (patch) | |
tree | 23ea0518973f1f8be02df8bed13187e2db15426a /nuttx/Makefile.win | |
parent | 489f661ddac1b60e10e94c2d212b958b23dc26a7 (diff) | |
download | px4-nuttx-1d19f1a16f4dac43bf0f9b00eca9fa5cb2d60953.tar.gz px4-nuttx-1d19f1a16f4dac43bf0f9b00eca9fa5cb2d60953.tar.bz2 px4-nuttx-1d19f1a16f4dac43bf0f9b00eca9fa5cb2d60953.zip |
Move Makefile directory selections to a separate makefile fragment
Diffstat (limited to 'nuttx/Makefile.win')
-rw-r--r-- | nuttx/Makefile.win | 97 |
1 files changed, 6 insertions, 91 deletions
diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win index c77ce9c4b..4980e3597 100644 --- a/nuttx/Makefile.win +++ b/nuttx/Makefile.win @@ -63,9 +63,6 @@ else BOARD_DIR = configs$(DELIM)$(CONFIG_ARCH_BOARD) endif -# Add-on directories. These may or may not be in place in the -# NuttX source tree (they must be specifically installed) -# # CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file. # The default value of CONFIG_APPS_DIR is ..\apps. Ultimately, the application # will be built if APPDIR is defined. APPDIR will be defined if a directory containing @@ -76,21 +73,12 @@ CONFIG_APPS_DIR = ..\apps endif APPDIR := ${shell if exist "$(CONFIG_APPS_DIR)\Makefile" echo $(CONFIG_APPS_DIR)} -# All add-on directories. +# Add-on directories. These may or may not be in place in the +# NuttX source tree (they must be specifically installed) # # NUTTX_ADDONS is the list of directories built into the NuttX kernel. -# USER_ADDONS is the list of directories that will be built into the user application - -NUTTX_ADDONS := -USER_ADDONS := - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -USER_ADDONS += $(APPDIR) -else -NUTTX_ADDONS += $(APPDIR) -endif - -# Lists of build directories. +# USER_ADDONS is the list of directories that will be built into the user +# application # # FSDIRS depend on file descriptor support; NONFSDIRS do not (except for parts # of FSDIRS). We will exclude FSDIRS from the build if file descriptor @@ -103,53 +91,7 @@ endif # OTHERDIRS - These are directories that are not built but probably should # be cleaned to prevent garbage from collecting in them when changing # configurations. - -NONFSDIRS = sched $(ARCH_SRC) $(NUTTX_ADDONS) -FSDIRS = fs drivers binfmt -CONTEXTDIRS = $(APPDIR) -USERDIRS = -OTHERDIRS = lib - -ifeq ($(CONFIG_BUILD_PROTECTED),y) - -USERDIRS += libc mm $(USER_ADDONS) -ifeq ($(CONFIG_HAVE_CXX),y) -USERDIRS += libxx -endif - -else - -NONFSDIRS += libc mm -OTHERDIRS += $(USER_ADDONS) -ifeq ($(CONFIG_HAVE_CXX),y) -NONFSDIRS += libxx -else -OTHERDIRS += libxx -endif - -endif - -ifeq ($(CONFIG_LIB_SYSCALL),y) -NONFSDIRS += syscall -CONTEXTDIRS += syscall -USERDIRS += syscall -else -OTHERDIRS += syscall -endif - -ifeq ($(CONFIG_NX),y) -NONFSDIRS += graphics libnx -CONTEXTDIRS += graphics libnx -else -OTHERDIRS += graphics libnx -endif - -ifeq ($(CONFIG_AUDIO),y) -NONFSDIRS += audio -else -OTHERDIRS += audio -endif - +# # CLEANDIRS are the directories that will clean in. These are # all directories that we know about. # KERNDEPDIRS are the directories in which we will build target dependencies. @@ -158,34 +100,7 @@ endif # USERDEPDIRS. If NuttX and applications are built separately (CONFIG_BUILD_PROTECTED), # then this holds only the directories containing user files. -CLEANDIRS = $(NONFSDIRS) $(FSDIRS) $(USERDIRS) $(OTHERDIRS) -KERNDEPDIRS = $(NONFSDIRS) -USERDEPDIRS = $(USERDIRS) - -# Add file system directories to KERNDEPDIRS (they are already in CLEANDIRS) - -ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) -ifeq ($(CONFIG_NET),y) -ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) -KERNDEPDIRS += fs -endif -KERNDEPDIRS += drivers -endif -else -KERNDEPDIRS += $(FSDIRS) -endif - -# Add networking directories to KERNDEPDIRS and CLEANDIRS - -ifeq ($(CONFIG_NET),y) -KERNDEPDIRS += net -endif -CLEANDIRS += net - -ifeq ($(CONFIG_CRYPTO),y) -KERNDEPDIRS += crypto -endif -CLEANDIRS += crypto +include Directories.mk # # Extra objects used in the final link. |