diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-05-10 15:50:23 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-05-10 15:50:23 +0000 |
commit | b178fec3d84131c06bb015d60533a1b704650008 (patch) | |
tree | c14a8e28ee4a2b3cdaf038eceb9c4b356c8505b6 /apps/Makefile | |
parent | 6327539fc800e6d481ff26067c1a40ca01ae6de1 (diff) | |
download | nuttx-b178fec3d84131c06bb015d60533a1b704650008.tar.gz nuttx-b178fec3d84131c06bb015d60533a1b704650008.tar.bz2 nuttx-b178fec3d84131c06bb015d60533a1b704650008.zip |
Pascal now installs in the apps/ directory
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3583 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/Makefile')
-rw-r--r-- | apps/Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/apps/Makefile b/apps/Makefile index c8c5bcd14..487fd94f5 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -48,20 +48,20 @@ APPDIR = ${shell pwd} # list can be extended by the .config file as well CONFIGURED_APPS = -SUBDIRS = namedapp nshlib netutils examples vsn +SUBDIRS = examples interpreters namedapp nshlib netutils vsn -include .config -# BUILTIN_APPS_DIR is the list of currently available application directories. It -# is the same as CONFIGURED_APPS, but filtered to exclude any non-existent apps +# 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. # namedapp is always in the list of applications to be built -BUILTIN_APPS_DIR = namedapp +INSTALLED_APPS = namedapp -# Create the list of available applications (BUILTIN_APPS_DIR) +# Create the list of available applications (INSTALLED_APPS) define ADD_BUILTIN -BUILTIN_APPS_DIR += ${shell if [ -r $1/Makefile ]; then echo "$1"; fi} +INSTALLED_APPS += ${shell if [ -r $1/Makefile ]; then echo "$1"; fi} endef $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN)))) @@ -73,18 +73,18 @@ BIN = libapps$(LIBEXT) # Build targets all: $(BIN) -.PHONY: $(BUILTIN_APPS_DIR) context depend clean distclean +.PHONY: $(INSTALLED_APPS) context depend clean distclean -$(BUILTIN_APPS_DIR): +$(INSTALLED_APPS): @$(MAKE) -C $@ TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; -$(BIN): $(BUILTIN_APPS_DIR) +$(BIN): $(INSTALLED_APPS) @( for obj in $(OBJS) ; do \ $(call ARCHIVE, $@, $${obj}); \ done ; ) .context: - @for dir in $(BUILTIN_APPS_DIR) ; do \ + @for dir in $(INSTALLED_APPS) ; do \ rm -f $$dir/.context ; \ $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" context ; \ done @@ -93,7 +93,7 @@ $(BIN): $(BUILTIN_APPS_DIR) context: .context .depend: context Makefile $(SRCS) - @for dir in $(BUILTIN_APPS_DIR) ; do \ + @for dir in $(INSTALLED_APPS) ; do \ rm -f $$dir/.depend ; \ $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" depend ; \ done |