summaryrefslogtreecommitdiff
path: root/nuttx/configs/ea3131/locked
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-21 21:59:35 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-21 21:59:35 +0000
commitaa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2 (patch)
tree2ee3d56220eb419976035ac38aa73dc8f5e249b8 /nuttx/configs/ea3131/locked
parent60051cba0cf424e01ef2eda09816ee8945867b6d (diff)
downloadpx4-nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.tar.gz
px4-nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.tar.bz2
px4-nuttx-aa6acd09ef4900ece87a4d5e0fde449ba7bdb8e2.zip
Prep for 6.0 releasenuttx-6.0
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3408 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/ea3131/locked')
-rwxr-xr-xnuttx/configs/ea3131/locked/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/configs/ea3131/locked/Makefile b/nuttx/configs/ea3131/locked/Makefile
index a6bae11a0..053781578 100755
--- a/nuttx/configs/ea3131/locked/Makefile
+++ b/nuttx/configs/ea3131/locked/Makefile
@@ -44,18 +44,18 @@ PASS1_LIBBOARD = $(PASS1_BOARDDIR)/libboard$(LIBEXT)
# Where is the application library?
-ifneq ($(CONFIG_APP_DIR),)
-PASS1_LIBAPP = $(CONFIG_APP_DIR)/libapp$(LIBEXT)
+ifneq ($(CONFIG_APPS_DIR),)
+PASS1_LIBAPPS = $(CONFIG_APPS_DIR)/libapps$(LIBEXT)
else
ifneq ($(APPDIR),)
-PASS1_LIBAPP = $(APPDIR)/libapps$(LIBEXT)
+PASS1_LIBAPPS = $(APPDIR)/libapps$(LIBEXT)
endif
endif
-# Remove the application library (libapp) from the list of libraries. Add
+# Remove the application library (libapps) from the list of libraries. Add
# the boad library (liboard)
-PASS1_LINKLIBS = $(filter-out $(PASS1_LIBAPP),$(LINKLIBS))
+PASS1_LINKLIBS = $(filter-out $(PASS1_LIBAPPS),$(LINKLIBS))
PASS1_LINKLIBS += $(PASS1_LIBBOARD)
# Get the paths to the libraries and the links script path in format that