sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/ build now supports an 'external' directory

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4021 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-10-05 14:37:39 +00:00
parent fc02cfd242
commit 9ff4cc1bdd
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.txt
View File

@ -120,3 +120,7 @@
data received on USB serial is echoed on the local console. data received on USB serial is echoed on the local console.
* apps/examples/touchscreen: Add a simple, generic test for any * apps/examples/touchscreen: Add a simple, generic test for any
touschscreen driver. touschscreen driver.
* Makefile: The apps/ Makefile now checks for an apps/external directory
or symbolic link. If such a directory/link exists (and has a Makefile),
it will be added to the apps/ build. This allows external directories
to be included into the apps/ build by simply creating a symbolic link.

15
Makefile
View File

@ -53,19 +53,28 @@ SUBDIRS = examples graphics interpreters namedapp nshlib netutils system vsn
-include .config -include .config
# INSTALLED_APPS is the list of currently available application directories. It # INSTALLED_APPS is the list of currently available application directories. It
# is the same as CONFIGURED_APPS, but filtered to exclude any non-existent apps. # is the same as CONFIGURED_APPS, but filtered to exclude any non-existent
# namedapp is always in the list of applications to be built # application directory. namedapp is always in the list of applications to be
# built.
INSTALLED_APPS = namedapp INSTALLED_APPS = namedapp
# Create the list of available applications (INSTALLED_APPS) # Create the list of available applications (INSTALLED_APPS)
define ADD_BUILTIN define ADD_BUILTIN
INSTALLED_APPS += ${shell if [ -r $1/Makefile ]; then echo "$1"; fi} INSTALLED_APPS += ${shell if [ -r $1/Makefile ]; then echo "$1"; fi}
endef endef
$(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN)))) $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN))))
# The external/ directory may also be added to the INSTALLED_APPS. But there
# is no external/ directory in the repository. Rather, this directory may be
# provided by the user (possibly as a symbolic link) to add libraries and
# applications to the standard build from the repository.
INSTALLED_APPS += ${shell if [ -r external/Makefile ]; then echo "external"; fi}
SUBDIRS += ${shell if [ -r external/Makefile ]; then echo "external"; fi}
# The final build target # The final build target
BIN = libapps$(LIBEXT) BIN = libapps$(LIBEXT)