From 9936518f53af0db714e8e5871fb08ef934111c2d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 30 Aug 2014 10:07:39 -0600 Subject: Move Makefile library selections to a separate makefile fragment --- nuttx/FlatLibs.mk | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++ nuttx/Makefile.unix | 93 ++------------------------------------ nuttx/Makefile.win | 102 ++++-------------------------------------- 3 files changed, 138 insertions(+), 182 deletions(-) create mode 100644 nuttx/FlatLibs.mk diff --git a/nuttx/FlatLibs.mk b/nuttx/FlatLibs.mk new file mode 100644 index 000000000..d9775a9a8 --- /dev/null +++ b/nuttx/FlatLibs.mk @@ -0,0 +1,125 @@ +############################################################################ +# FlatLibs.mk +# +# Copyright (C) 2007-2012, 2014 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +# NUTTXLIBS is the list of NuttX libraries that is passed to the +# processor-specific Makefile to build the final NuttX target. +# Libraries in FSDIRS are excluded if file descriptor support +# is disabled. +# USERLIBS is the list of libraries used to build the final user-space +# application + +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) +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 + +ifeq ($(CONFIG_NET),y) +NUTTXLIBS += lib$(DELIM)libnet$(LIBEXT) +endif + +# Add libraries for Crypto API support + +ifeq ($(CONFIG_CRYPTO),y) +NUTTXLIBS += lib$(DELIM)libcrypto$(LIBEXT) +endif + +# Add libraries for file system support + +ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) +ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) +NUTTXLIBS += lib$(DELIM)libfs$(LIBEXT) +endif +ifeq ($(CONFIG_NET),y) +NUTTXLIBS += lib$(DELIM)libdrivers$(LIBEXT) +endif +else +NUTTXLIBS += lib$(DELIM)libfs$(LIBEXT) lib$(DELIM)libdrivers$(LIBEXT) lib$(DELIM)libbinfmt$(LIBEXT) +endif + +# Add libraries for the NX graphics sub-system + +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 + +ifeq ($(CONFIG_AUDIO),y) +NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT) +endif diff --git a/nuttx/Makefile.unix b/nuttx/Makefile.unix index ac8d1ad01..dfc0762d5 100644 --- a/nuttx/Makefile.unix +++ b/nuttx/Makefile.unix @@ -122,98 +122,13 @@ ifeq ($(CONFIG_BUILD_2PASS),y) EXTRA_OBJS += $(CONFIG_PASS1_OBJECT) endif -# NUTTXLIBS is the list of NuttX libraries that is passed to the -# processor-specific Makefile to build the final NuttX target. -# Libraries in FSDIRS are excluded if file descriptor support -# is disabled. -# USERLIBS is the list of libraries used to build the final user-space -# application - -NUTTXLIBS = lib/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/libstubs$(LIBEXT) lib/libkc$(LIBEXT) lib/libkmm$(LIBEXT) -NUTTXLIBS += lib/libkarch$(LIBEXT) -USERLIBS += lib/libproxies$(LIBEXT) lib/libuc$(LIBEXT) lib/libumm$(LIBEXT) -USERLIBS += lib/libuarch$(LIBEXT) -else -NUTTXLIBS += lib/libc$(LIBEXT) lib/libmm$(LIBEXT) lib/libarch$(LIBEXT) -ifeq ($(CONFIG_LIB_SYSCALL),y) -NUTTXLIBS += lib/libstubs$(LIBEXT) -USERLIBS += lib/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/libcxx$(LIBEXT) -else -NUTTXLIBS += lib/libcxx$(LIBEXT) -endif -endif - -# Add library for application support. - -ifneq ($(APPDIR),) -ifeq ($(CONFIG_BUILD_PROTECTED),y) -USERLIBS += lib/libapps$(LIBEXT) -else -NUTTXLIBS += lib/libapps$(LIBEXT) -endif -endif +# Library build selections -# Add libraries for network support +include FlatLibs.mk -ifeq ($(CONFIG_NET),y) -NUTTXLIBS += lib/libnet$(LIBEXT) -endif - -# Add libraries for Crypto API support - -ifeq ($(CONFIG_CRYPTO),y) -NUTTXLIBS += lib/libcrypto$(LIBEXT) -endif - -# Add libraries for file system support - -ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) -ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) -NUTTXLIBS += lib/libfs$(LIBEXT) -endif -ifeq ($(CONFIG_NET),y) -NUTTXLIBS += lib/libdrivers$(LIBEXT) -endif -else -NUTTXLIBS += lib/libfs$(LIBEXT) lib/libdrivers$(LIBEXT) lib/libbinfmt$(LIBEXT) -endif - -# Add libraries for the NX graphics sub-system - -ifeq ($(CONFIG_NX),y) -NUTTXLIBS += lib/libgraphics$(LIBEXT) -ifeq ($(CONFIG_BUILD_PROTECTED),y) -NUTTXLIBS += lib/libknx$(LIBEXT) -USERLIBS += lib/libunx$(LIBEXT) -else -NUTTXLIBS += lib/libnx$(LIBEXT) -endif -endif - -# Add libraries for the audio sub-system - -ifeq ($(CONFIG_AUDIO),y) -NUTTXLIBS += lib/libaudio$(LIBEXT) -endif -# LINKLIBS derives from NUTTXLIBS and is simply the same list with the subdirectory removed +# LINKLIBS derives from NUTTXLIBS and is simply the same list with the +# subdirectory removed LINKLIBS = $(patsubst lib/%,%,$(NUTTXLIBS)) diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win index 4980e3597..faa5d4cec 100644 --- a/nuttx/Makefile.win +++ b/nuttx/Makefile.win @@ -95,10 +95,12 @@ APPDIR := ${shell if exist "$(CONFIG_APPS_DIR)\Makefile" echo $(CONFIG_APPS_DIR) # 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_BUILD_PROTECTED), -# then this holds only the directories containing kernel files. +# If NuttX and applications are built separately (CONFIG_BUILD_PROTECTED or +# CONFIG_BUILD_KERNEL), then this holds only the directories containing +# kernel files. # USERDEPDIRS. If NuttX and applications are built separately (CONFIG_BUILD_PROTECTED), -# then this holds only the directories containing user files. +# then this holds only the directories containing user files. If +# CONFIG_BUILD_KERNEL is selected, then applications are not build at all. include Directories.mk @@ -113,98 +115,12 @@ ifeq ($(CONFIG_BUILD_2PASS),y) EXTRA_OBJS += $(CONFIG_PASS1_OBJECT) endif -# NUTTXLIBS is the list of NuttX libraries that is passed to the -# processor-specific Makefile to build the final NuttX target. -# Libraries in FSDIRS are excluded if file descriptor support -# is disabled. -# USERLIBS is the list of libraries used to build the final user-space -# application - -NUTTXLIBS = lib\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\libstubs$(LIBEXT) lib\libkc$(LIBEXT) lib\libkmm$(LIBEXT) -NUTTXLIBS += lib\libkarch$(LIBEXT) -USERLIBS += lib\libproxies$(LIBEXT) lib\libuc$(LIBEXT) lib\libumm$(LIBEXT) -USERLIBS += lib\libuarch$(LIBEXT) -else -NUTTXLIBS += lib\libc$(LIBEXT) lib\libmm$(LIBEXT) lib\libarch$(LIBEXT) -ifeq ($(CONFIG_LIB_SYSCALL),y) -NUTTXLIBS += lib/libstubs$(LIBEXT) -USERLIBS += lib/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\libcxx$(LIBEXT) -else -NUTTXLIBS += lib\libcxx$(LIBEXT) -endif -endif - -# Add library for application support. - -ifneq ($(APPDIR),) -ifeq ($(CONFIG_BUILD_PROTECTED),y) -USERLIBS += lib\libapps$(LIBEXT) -else -NUTTXLIBS += lib\libapps$(LIBEXT) -endif -endif - -# Add libraries for network support +# Library build selections -ifeq ($(CONFIG_NET),y) -NUTTXLIBS += lib\libnet$(LIBEXT) -endif - -# Add libraries for Crypto API support - -ifeq ($(CONFIG_CRYPTO),y) -NUTTXLIBS += lib\libcrypto$(LIBEXT) -endif - -# Add libraries for file system support - -ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) -ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) -NUTTXLIBS += lib\libfs$(LIBEXT) -endif -ifeq ($(CONFIG_NET),y) -NUTTXLIBS += lib\libdrivers$(LIBEXT) -endif -else -NUTTXLIBS += lib\libfs$(LIBEXT) lib\libdrivers$(LIBEXT) lib\libbinfmt$(LIBEXT) -endif - -# Add libraries for the NX graphics sub-system - -ifeq ($(CONFIG_NX),y) -NUTTXLIBS += lib\libgraphics$(LIBEXT) -ifeq ($(CONFIG_BUILD_PROTECTED),y) -NUTTXLIBS += lib\libknx$(LIBEXT) -USERLIBS += lib\libunx$(LIBEXT) -else -NUTTXLIBS += lib\libnx$(LIBEXT) -endif -endif - -# Add libraries for the Audio sub-system - -ifeq ($(CONFIG_AUDIO),y) -NUTTXLIBS += lib\libaudio$(LIBEXT) -endif +include FlatLibs.mk -# LINKLIBS derives from NUTTXLIBS and is simply the same list with the subdirectory removed +# LINKLIBS derives from NUTTXLIBS and is simply the same list with the +# subdirectory removed LINKLIBS = $(patsubst lib\\%,%,$(NUTTXLIBS)) -- cgit v1.2.3