aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-02-10 10:30:14 +0100
committerBjörn Gustavsson <[email protected]>2012-02-10 10:48:02 +0100
commitb4607b03321ad0f0f99cf8905da84dd5e47eb733 (patch)
tree150bdcbf7e7ffe262f6472b19c6cb18fdb4cd976 /lib
parent77c25673f38dafc4cba70c4cd894609c09db93a5 (diff)
downloadotp-b4607b03321ad0f0f99cf8905da84dd5e47eb733.tar.gz
otp-b4607b03321ad0f0f99cf8905da84dd5e47eb733.tar.bz2
otp-b4607b03321ad0f0f99cf8905da84dd5e47eb733.zip
Teach lib/Makefile to build applications listed in EXTRA-APPLICATIONS
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 9a925b0b86..aa4e074830 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -32,6 +32,8 @@ ifdef BUILD_ALL
cosProperty cosFileTransfer cosEventDomain et megaco webtool \
xmerl edoc eunit ssh inviso typer erl_docgen \
percept dialyzer hipe
+ EXTRA_FILE := $(wildcard EXTRA-APPLICATIONS)
+ EXTRA_APPLICATIONS := $(if $(EXTRA_FILE),$(shell cat $(EXTRA_FILE)))
endif
ifdef BOOTSTRAP
@@ -44,7 +46,9 @@ else
ifdef TERTIARY_BOOTSTRAP
SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools wx
else # Not bootstrap build
- SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) $(OTHER_SUB_DIRECTORIES)
+ SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) \
+ $(OTHER_SUB_DIRECTORIES) \
+ $(EXTRA_APPLICATIONS)
endif
endif
endif