diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-10 14:42:28 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-10 14:42:28 +0000 |
| commit | 506452c6fa4b7d408da0d332100f43a3102168ab (patch) | |
| tree | bca4f4b7d50f699ff0c88572958ed38f6d747244 /nuttx/Makefile | |
| parent | ebc734d8e40e310bc94bd8321a70ce1b8ef5d5a9 (diff) | |
| download | nuttx-506452c6fa4b7d408da0d332100f43a3102168ab.tar.gz nuttx-506452c6fa4b7d408da0d332100f43a3102168ab.tar.bz2 nuttx-506452c6fa4b7d408da0d332100f43a3102168ab.zip | |
add apps/ dir
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3360 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
| -rw-r--r-- | nuttx/Makefile | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index 231173a21..4c44492b6 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -59,11 +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_DIR := ${shell if [ -r $(APPS_LOC)/Makefile ]; then echo "$(APPS_LOC)"; fi} PCODE_DIR := ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi} -ADDON_DIRS := $(PCODE_DIR) $(NX_DIR) +ADDON_DIRS := $(PCODE_DIR) $(NX_DIR) $(APPS_DIR) # FSDIRS depend on file descriptor support; NONFSDIRS do not # (except for parts of FSDIRS). We will exclude FSDIRS @@ -127,6 +132,18 @@ ifeq ($(CONFIG_HAVE_CXX),y) LINKLIBS += libxx/liblibxx$(LIBEXT) endif +# Add library for application support +# 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) +LINKLIBS += $(APPS_DIR)/libapps$(LIBEXT) +endif +endif + # Add libraries for network support ifeq ($(CONFIG_NET),y) @@ -249,6 +266,9 @@ fs/libfs$(LIBEXT): context drivers/libdrivers$(LIBEXT): context @$(MAKE) -C drivers TOPDIR="$(TOPDIR)" libdrivers$(LIBEXT) +$(APPS_DIR)/libapps$(LIBEXT): context + @$(MAKE) -C $(APPS_DIR) TOPDIR="$(TOPDIR)" libapps$(LIBEXT) + binfmt/libbinfmt$(LIBEXT): context @$(MAKE) -C binfmt TOPDIR="$(TOPDIR)" libbinfmt$(LIBEXT) |