diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-16 12:41:58 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-16 12:41:58 +0000 |
| commit | da3dd04ea56562e2a50606be907fe99d11822d9d (patch) | |
| tree | c71a30be978332c2b24582697e98963c8d442794 /apps/Makefile | |
| parent | e24f4089720b27bc926d778eff89297ab944e457 (diff) | |
| download | px4-firmware-da3dd04ea56562e2a50606be907fe99d11822d9d.tar.gz px4-firmware-da3dd04ea56562e2a50606be907fe99d11822d9d.tar.bz2 px4-firmware-da3dd04ea56562e2a50606be907fe99d11822d9d.zip | |
Changes from Mike
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5361 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/Makefile')
| -rw-r--r-- | apps/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/apps/Makefile b/apps/Makefile index c172135ec..7e7d52a40 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -102,15 +102,9 @@ endif # Create the list of available applications (INSTALLED_APPS) -ifeq ($(CONFIG_WINDOWS_NATIVE),y) -define ADD_BUILTIN - INSTALLED_APPS += $(if $(wildcard $1\Makefile),$1,) -endef -else define ADD_BUILTIN - INSTALLED_APPS += $(if $(wildcard $1/Makefile),$1,) + INSTALLED_APPS += $(if $(wildcard $1$(DELIM)Makefile),$1,) endef -endif $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN)))) @@ -119,7 +113,8 @@ $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN)))) # provided by the user (possibly as a symbolic link) to add libraries and # applications to the standard build from the repository. -EXTERNAL_DIR := $(dir $(wildcard external/Makefile)) +EXTERNAL_DIR := $(dir $(wildcard external$(DELIM)Makefile)) + INSTALLED_APPS += $(EXTERNAL_DIR) SUBDIRS += $(EXTERNAL_DIR) |