diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 14:47:22 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 14:47:22 -0600 |
| commit | 64892e44f2ce2612c77b1b20497fb007adafafb8 (patch) | |
| tree | 2c917f29727a017b85193ac85959663d504b26e5 /nuttx/Makefile.unix | |
| parent | c48af0eb9c61462f59a7ba63ca7a73e8df146f49 (diff) | |
| download | nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.tar.gz nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.tar.bz2 nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.zip | |
Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL
Diffstat (limited to 'nuttx/Makefile.unix')
| -rw-r--r-- | nuttx/Makefile.unix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/Makefile.unix b/nuttx/Makefile.unix index 318e7f715..a5b3aa47e 100644 --- a/nuttx/Makefile.unix +++ b/nuttx/Makefile.unix @@ -91,7 +91,7 @@ APPDIR := ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_APP NUTTX_ADDONS := USER_ADDONS := -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) USER_ADDONS += $(APPDIR) else NUTTX_ADDONS += $(APPDIR) @@ -117,7 +117,7 @@ CONTEXTDIRS = $(APPDIR) USERDIRS = OTHERDIRS = lib -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) USERDIRS += libc mm $(USER_ADDONS) ifeq ($(CONFIG_HAVE_CXX),y) @@ -160,9 +160,9 @@ 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. -# If NuttX and applications are built separately (CONFIG_NUTTX_KERNEL), +# If NuttX and applications are built separately (CONFIG_BUILD_PROTECTED), # then this holds only the directories containing kernel files. -# USERDEPDIRS. If NuttX and applications are built separately (CONFIG_NUTTX_KERNEL), +# 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) @@ -219,7 +219,7 @@ USERLIBS = # both the kernel- and user-space builds. For now, the memory manager (mm) # is placed in user space (only). -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) NUTTXLIBS += lib/libstubs$(LIBEXT) lib/libkc$(LIBEXT) lib/libkmm$(LIBEXT) NUTTXLIBS += lib/libkarch$(LIBEXT) USERLIBS += lib/libproxies$(LIBEXT) lib/libuc$(LIBEXT) lib/libumm$(LIBEXT) @@ -236,7 +236,7 @@ endif # be defined in Make.defs for this to work! ifeq ($(CONFIG_HAVE_CXX),y) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) USERLIBS += lib/libcxx$(LIBEXT) else NUTTXLIBS += lib/libcxx$(LIBEXT) @@ -246,7 +246,7 @@ endif # Add library for application support. ifneq ($(APPDIR),) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) USERLIBS += lib/libapps$(LIBEXT) else NUTTXLIBS += lib/libapps$(LIBEXT) @@ -282,7 +282,7 @@ endif ifeq ($(CONFIG_NX),y) NUTTXLIBS += lib/libgraphics$(LIBEXT) -ifeq ($(CONFIG_NUTTX_KERNEL),y) +ifeq ($(CONFIG_BUILD_PROTECTED),y) NUTTXLIBS += lib/libknx$(LIBEXT) USERLIBS += lib/libunx$(LIBEXT) else |