aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-02-14 17:33:58 +0100
committerRickard Green <[email protected]>2013-02-14 17:33:58 +0100
commit39610314511a1ccc40472147a2f0ebc3d179fe23 (patch)
treecca1ea0eaf872a6e969fc23e27f63153f9732977 /lib
parent45422f6fd460d6acc30e66f58dc2188d232f2b12 (diff)
parent42f42d99fca3b303bd2cf7d54e4b76c0965f51e4 (diff)
downloadotp-39610314511a1ccc40472147a2f0ebc3d179fe23.tar.gz
otp-39610314511a1ccc40472147a2f0ebc3d179fe23.tar.bz2
otp-39610314511a1ccc40472147a2f0ebc3d179fe23.zip
Merge branch 'rickard/small-build'
* rickard/small-build: Include apps needed for tests and doc in small build
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 64b17a3cca..6a12334d8d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -20,18 +20,17 @@ include $(ERL_TOP)/make/target.mk
include $(ERL_TOP)/make/$(TARGET)/otp.mk
ERTS_SUB_DIRECTORIES = stdlib sasl kernel compiler
-OTHER_SUB_DIRECTORIES = tools test_server common_test runtime_tools
+OTHER_SUB_DIRECTORIES = tools test_server common_test runtime_tools \
+ inets xmerl edoc erl_docgen
ifdef BUILD_ALL
OTHER_SUB_DIRECTORIES += \
snmp otp_mibs appmon erl_interface asn1 jinterface \
- wx debugger reltool gs inets \
+ wx debugger reltool gs \
ic mnesia crypto orber os_mon parsetools syntax_tools \
- pman public_key ssl toolbar tv observer odbc \
- diameter \
+ pman public_key ssl toolbar tv observer odbc diameter \
cosTransactions cosEvent cosTime cosNotification \
cosProperty cosFileTransfer cosEventDomain et megaco webtool \
- xmerl edoc eunit ssh typer erl_docgen \
- percept eldap dialyzer hipe
+ eunit ssh typer percept eldap dialyzer hipe
EXTRA_FILE := $(wildcard EXTRA-APPLICATIONS)
EXTRA_APPLICATIONS := $(if $(EXTRA_FILE),$(shell cat $(EXTRA_FILE)))
endif