diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-18 17:22:50 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-18 17:22:50 +0000 |
| commit | 5029575d531576c6818094334dcae95359bdd119 (patch) | |
| tree | 30c8e74443d6b893cc9c7cd07ba3a87da6c10ce4 /nuttx/Makefile | |
| parent | 89410c7157fd6e2c5f13dc4814606c97dd2d715f (diff) | |
| download | px4-nuttx-5029575d531576c6818094334dcae95359bdd119.tar.gz px4-nuttx-5029575d531576c6818094334dcae95359bdd119.tar.bz2 px4-nuttx-5029575d531576c6818094334dcae95359bdd119.zip | |
Update to apps/build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3391 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
| -rw-r--r-- | nuttx/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index c7e2406ef..1e180b142 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -64,8 +64,10 @@ BOARD_DIR = configs/$(CONFIG_ARCH_BOARD) # # APPS_LOC can be over-ridden from the command line: -ifeq ($(CONFIG_BUILTIN_APPS_NUTTX),y) +ifeq ($(CONFIG_BUILTIN_APPS),y) +ifeq ($(APP_LOC),) APPS_LOC = ../apps +endif APPS_DIR := ${shell if [ -r $(APPS_LOC)/Makefile ]; then echo "$(APPS_LOC)"; fi} endif @@ -138,13 +140,9 @@ endif # Always compile the framework which includes exec_nuttapp if users # or nuttX applications are to be included. -ifeq ($(CONFIG_BUILTIN_APPS_NUTTX),y) -LINKLIBS += $(APPS_DIR)/libapps$(LIBEXT) -else -ifeq ($(CONFIG_BUILTIN_APPS_USER),y) +ifeq ($(CONFIG_BUILTIN_APPS),y) LINKLIBS += $(APPS_DIR)/libapps$(LIBEXT) endif -endif # Add libraries for network support |