Changes from Mike

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5361 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-11-16 12:41:58 +00:00
parent e24f408972
commit da3dd04ea5
15 changed files with 55 additions and 25 deletions
+3 -8
View File
@@ -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,)
INSTALLED_APPS += $(if $(wildcard $1$(DELIM)Makefile),$1,)
endef
else
define ADD_BUILTIN
INSTALLED_APPS += $(if $(wildcard $1/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)