sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

In the kernel build, only the user libraries should be exported.

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-04 11:43:41 -06:00
parent 111e44ff74
commit b000425e52
5 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FlatLibs.mk
View File

@ -39,6 +39,8 @@
# is disabled. # is disabled.
# USERLIBS is the list of libraries used to build the final user-space # USERLIBS is the list of libraries used to build the final user-space
# application # application
# EXPORTLIBS is the list of libraries that should be exported by
# 'make export' is
NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT) NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT)
USERLIBS = USERLIBS =
@ -102,3 +104,7 @@ endif
ifeq ($(CONFIG_AUDIO),y) ifeq ($(CONFIG_AUDIO),y)
NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT) NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT)
endif endif
# Export all libraries
EXPORTLIBS = $(NUTTXLIBS)

6
KernelLibs.mk
View File

@ -39,6 +39,8 @@
# is disabled. # is disabled.
# USERLIBS is the list of libraries used to build the final user-space # USERLIBS is the list of libraries used to build the final user-space
# application # application
# EXPORTLIBS is the list of libraries that should be exported by
# 'make export' is
NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT) NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT)
USERLIBS = USERLIBS =
@ -97,3 +99,7 @@ endif
ifeq ($(CONFIG_AUDIO),y) ifeq ($(CONFIG_AUDIO),y)
NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT) NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT)
endif endif
# Export only the user libraries
EXPORTLIBS = $(USERLIBS)

13
Makefile.unix
View File

@ -123,6 +123,15 @@ EXTRA_OBJS += $(CONFIG_PASS1_OBJECT)
endif endif
# Library build selections # Library build selections
#
# 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
# EXPORTLIBS is the list of libraries that should be exported by
# 'make export' is
ifeq ($(CONFIG_BUILD_PROTECTED),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
include ProtectedLibs.mk include ProtectedLibs.mk
@ -135,7 +144,7 @@ endif
endif endif
# LINKLIBS derives from NUTTXLIBS and is simply the same list with the # LINKLIBS derives from NUTTXLIBS and is simply the same list with the
# subdirectory removed # subdirectory removed
LINKLIBS = $(patsubst lib/%,%,$(NUTTXLIBS)) LINKLIBS = $(patsubst lib/%,%,$(NUTTXLIBS))
@ -616,7 +625,7 @@ gconfig:
# that the archiver is 'ar' # that the archiver is 'ar'
export: pass2deps export: pass2deps
$(Q) tools/mkexport.sh -w$(WINTOOL) -t "$(TOPDIR)" -l "$(NUTTXLIBS)" $(Q) tools/mkexport.sh -w$(WINTOOL) -t "$(TOPDIR)" -l "$(EXPORTLIBS)"
# General housekeeping targets: dependencies, cleaning, etc. # General housekeeping targets: dependencies, cleaning, etc.
# #

13
Makefile.win
View File

@ -116,6 +116,15 @@ EXTRA_OBJS += $(CONFIG_PASS1_OBJECT)
endif endif
# Library build selections # Library build selections
#
# 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
# EXPORTLIBS is the list of libraries that should be exported by
# 'make export' is
ifeq ($(CONFIG_BUILD_PROTECTED),y) ifeq ($(CONFIG_BUILD_PROTECTED),y)
include ProtectedLibs.mk include ProtectedLibs.mk
@ -128,7 +137,7 @@ endif
endif endif
# LINKLIBS derives from NUTTXLIBS and is simply the same list with the # LINKLIBS derives from NUTTXLIBS and is simply the same list with the
# subdirectory removed # subdirectory removed
LINKLIBS = $(patsubst lib\\%,%,$(NUTTXLIBS)) LINKLIBS = $(patsubst lib\\%,%,$(NUTTXLIBS))
@ -613,7 +622,7 @@ menuconfig: configenv
# that the archiver is 'ar' # that the archiver is 'ar'
export: pass2deps export: pass2deps
$(Q) tools\mkexport.sh -w$(WINTOOL) -t "$(TOPDIR)" -l "$(NUTTXLIBS)" $(Q) tools\mkexport.sh -w$(WINTOOL) -t "$(TOPDIR)" -l "$(EXPORTLIBS)"
# General housekeeping targets: dependencies, cleaning, etc. # General housekeeping targets: dependencies, cleaning, etc.
# #

6
ProtectedLibs.mk
View File

@ -39,6 +39,8 @@
# is disabled. # is disabled.
# USERLIBS is the list of libraries used to build the final user-space # USERLIBS is the list of libraries used to build the final user-space
# application # application
# EXPORTLIBS is the list of libraries that should be exported by
# 'make export' is
NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT) NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT)
USERLIBS = USERLIBS =
@ -107,3 +109,7 @@ endif
ifeq ($(CONFIG_AUDIO),y) ifeq ($(CONFIG_AUDIO),y)
NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT) NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT)
endif endif
# Export only the user libraries
EXPORTLIBS = $(USERLIBS)