diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-30 10:43:58 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-30 10:43:58 -0600 |
| commit | 994aa23afe0095bbb54a0bcf83d33508936ac479 (patch) | |
| tree | 6112be4a4b268830b92ac656eec42587132e2446 /nuttx/FlatLibs.mk | |
| parent | 9936518f53af0db714e8e5871fb08ef934111c2d (diff) | |
| download | px4-nuttx-994aa23afe0095bbb54a0bcf83d33508936ac479.tar.gz px4-nuttx-994aa23afe0095bbb54a0bcf83d33508936ac479.tar.bz2 px4-nuttx-994aa23afe0095bbb54a0bcf83d33508936ac479.zip | |
Separate flat, protected, and kernel mode library selected into separate files. The conditional logic as exceed my able to comprehend and maintain the selections.
Diffstat (limited to 'nuttx/FlatLibs.mk')
| -rw-r--r-- | nuttx/FlatLibs.mk | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/nuttx/FlatLibs.mk b/nuttx/FlatLibs.mk index d9775a9a8..58f443a52 100644 --- a/nuttx/FlatLibs.mk +++ b/nuttx/FlatLibs.mk @@ -43,43 +43,27 @@ NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT) USERLIBS = -# Add libraries for syscall support. The C library will be needed by -# both the kernel- and user-space builds. For now, the memory manager (mm) -# is placed in user space (only). - -ifeq ($(CONFIG_BUILD_PROTECTED),y) -NUTTXLIBS += lib$(DELIM)libstubs$(LIBEXT) lib$(DELIM)libkc$(LIBEXT) lib$(DELIM)libkmm$(LIBEXT) -NUTTXLIBS += lib$(DELIM)libkarch$(LIBEXT) -USERLIBS += lib$(DELIM)libproxies$(LIBEXT) lib$(DELIM)libuc$(LIBEXT) lib$(DELIM)libumm$(LIBEXT) -USERLIBS += lib$(DELIM)libuarch$(LIBEXT) -else -NUTTXLIBS += lib$(DELIM)libc$(LIBEXT) lib$(DELIM)libmm$(LIBEXT) lib$(DELIM)libarch$(LIBEXT) +# Add libraries for syscall support. + +NUTTXLIBS += lib$(DELIM)libc$(LIBEXT) lib$(DELIM)libmm$(LIBEXT) +NUTTXLIBS += lib$(DELIM)libarch$(LIBEXT) ifeq ($(CONFIG_LIB_SYSCALL),y) NUTTXLIBS += lib$(DELIM)libstubs$(LIBEXT) USERLIBS += lib$(DELIM)libproxies$(LIBEXT) endif -endif # Add libraries for C++ support. CXX, CXXFLAGS, and COMPILEXX must # be defined in Make.defs for this to work! ifeq ($(CONFIG_HAVE_CXX),y) -ifeq ($(CONFIG_BUILD_PROTECTED),y) -USERLIBS += lib$(DELIM)libcxx$(LIBEXT) -else NUTTXLIBS += lib$(DELIM)libcxx$(LIBEXT) endif -endif # Add library for application support. ifneq ($(APPDIR),) -ifeq ($(CONFIG_BUILD_PROTECTED),y) -USERLIBS += lib$(DELIM)libapps$(LIBEXT) -else NUTTXLIBS += lib$(DELIM)libapps$(LIBEXT) endif -endif # Add libraries for network support @@ -110,13 +94,8 @@ endif ifeq ($(CONFIG_NX),y) NUTTXLIBS += lib$(DELIM)libgraphics$(LIBEXT) -ifeq ($(CONFIG_BUILD_PROTECTED),y) -NUTTXLIBS += lib$(DELIM)libknx$(LIBEXT) -USERLIBS += lib$(DELIM)libunx$(LIBEXT) -else NUTTXLIBS += lib$(DELIM)libnx$(LIBEXT) endif -endif # Add libraries for the Audio sub-system |