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

5 files changed, 40 insertions, 4 deletions

diff --git a/nuttx/FlatLibs.mk b/nuttx/FlatLibs.mk
index 58f443a52..5bac59aed 100644
--- a/nuttx/FlatLibs.mk
+++ b/nuttx/FlatLibs.mk
@@ -39,6 +39,8 @@
 #   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
 
 NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT)
 USERLIBS =
@@ -102,3 +104,7 @@ endif
 ifeq ($(CONFIG_AUDIO),y)
 NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT)
 endif
+
+# Export all libraries
+
+EXPORTLIBS = $(NUTTXLIBS)
diff --git a/nuttx/KernelLibs.mk b/nuttx/KernelLibs.mk
index 8d7c35920..2f1870493 100644
--- a/nuttx/KernelLibs.mk
+++ b/nuttx/KernelLibs.mk
@@ -39,6 +39,8 @@
 #   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
 
 NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT)
 USERLIBS =
@@ -97,3 +99,7 @@ endif
 ifeq ($(CONFIG_AUDIO),y)
 NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT)
 endif
+
+# Export only the user libraries
+
+EXPORTLIBS = $(USERLIBS)
diff --git a/nuttx/Makefile.unix b/nuttx/Makefile.unix
index 5f64360fd..959cabfd1 100644
--- a/nuttx/Makefile.unix
+++ b/nuttx/Makefile.unix
@@ -123,6 +123,15 @@ EXTRA_OBJS += $(CONFIG_PASS1_OBJECT)
 endif
 
 # 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)
 include ProtectedLibs.mk
@@ -135,7 +144,7 @@ endif
 endif
 
 # LINKLIBS derives from NUTTXLIBS and is simply the same list with the
-# subdirectory removed
+#   subdirectory removed
 
 LINKLIBS = $(patsubst lib/%,%,$(NUTTXLIBS))
 
@@ -616,7 +625,7 @@ gconfig:
 # that the archiver is 'ar'
 
 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.
 #
diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win
index 2cd9a0b84..0efec094f 100644
--- a/nuttx/Makefile.win
+++ b/nuttx/Makefile.win
@@ -116,6 +116,15 @@ EXTRA_OBJS += $(CONFIG_PASS1_OBJECT)
 endif
 
 # 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)
 include ProtectedLibs.mk
@@ -128,7 +137,7 @@ endif
 endif
 
 # LINKLIBS derives from NUTTXLIBS and is simply the same list with the
-# subdirectory removed
+#   subdirectory removed
 
 LINKLIBS = $(patsubst lib\\%,%,$(NUTTXLIBS))
 
@@ -613,7 +622,7 @@ menuconfig: configenv
 # that the archiver is 'ar'
 
 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.
 #
diff --git a/nuttx/ProtectedLibs.mk b/nuttx/ProtectedLibs.mk
index 1a7a35fcf..c5d688db1 100644
--- a/nuttx/ProtectedLibs.mk
+++ b/nuttx/ProtectedLibs.mk
@@ -39,6 +39,8 @@
 #   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
 
 NUTTXLIBS = lib$(DELIM)libsched$(LIBEXT)
 USERLIBS =
@@ -107,3 +109,7 @@ endif
 ifeq ($(CONFIG_AUDIO),y)
 NUTTXLIBS += lib$(DELIM)libaudio$(LIBEXT)
 endif
+
+# Export only the user libraries
+
+EXPORTLIBS = $(USERLIBS)