diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-11 17:37:41 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-11 17:37:41 +0000 |
| commit | 1924debc29cbc64094cf41bbdf878c6c53dd4d7b (patch) | |
| tree | 440984e28c0c277108279ddd73686e8e34cf8d99 /nuttx/Makefile | |
| parent | faa4bb28e9f5e2e3c060ecb1ad7e5bc62f023292 (diff) | |
| download | px4-nuttx-1924debc29cbc64094cf41bbdf878c6c53dd4d7b.tar.gz px4-nuttx-1924debc29cbc64094cf41bbdf878c6c53dd4d7b.tar.bz2 px4-nuttx-1924debc29cbc64094cf41bbdf878c6c53dd4d7b.zip | |
More apps/ updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3366 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
| -rw-r--r-- | nuttx/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index 4c44492b6..c7e2406ef 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -59,14 +59,16 @@ ARCH_SRC = $(ARCH_DIR)/src ARCH_INC = $(ARCH_DIR)/include BOARD_DIR = configs/$(CONFIG_ARCH_BOARD) -# This can be over-ridden from the command line: - -APPS_LOC = ../apps - # Add-on directories. These may or may not be in place in the # NuttX source tree (they must be specifically installed) +# +# APPS_LOC can be over-ridden from the command line: +ifeq ($(CONFIG_BUILTIN_APPS_NUTTX),y) +APPS_LOC = ../apps APPS_DIR := ${shell if [ -r $(APPS_LOC)/Makefile ]; then echo "$(APPS_LOC)"; fi} +endif + PCODE_DIR := ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi} ADDON_DIRS := $(PCODE_DIR) $(NX_DIR) $(APPS_DIR) |