aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2012-02-10 10:14:34 +0100
committerBjörn Gustavsson <[email protected]>2012-02-10 10:39:44 +0100
commit77c25673f38dafc4cba70c4cd894609c09db93a5 (patch)
tree46cc2a5ad83d627c28dbe9a5936c904493992a93
parentc3fb91d203412c16d008b4c36fb13c0d776d8c46 (diff)
downloadotp-77c25673f38dafc4cba70c4cd894609c09db93a5.tar.gz
otp-77c25673f38dafc4cba70c4cd894609c09db93a5.tar.bz2
otp-77c25673f38dafc4cba70c4cd894609c09db93a5.zip
Clean up lib/Makefile
We only support building epmd, erl_interface, and ic for VxWorks; therefore there is no need to have a conditional section for VxWorks. We use to build different applications on Windows and Unix, but that is no longer the case; therefore one list of applications is sufficient. Unfortunately, there are build order dependencies between the applications, so we must not sort the list.
-rw-r--r--lib/Makefile48
1 files changed, 7 insertions, 41 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 402e73722a..9a925b0b86 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -19,53 +19,19 @@
include $(ERL_TOP)/make/target.mk
include $(ERL_TOP)/make/$(TARGET)/otp.mk
-#
-# Macros
-#
-ifeq ($(findstring vxworks,$(TARGET)),vxworks)
- ERTS_SUB_DIRECTORIES = stdlib sasl kernel compiler
- OTHER_SUB_DIRECTORIES = \
- snmp otp_mibs appmon erl_interface os_mon tools runtime_tools
- ifdef BUILD_ALL
- OTHER_SUB_DIRECTORIES += mnesia jinterface ic asn1 debugger \
- inets mnesia_session diameter orber pman tv observer \
- cosTransactions cosEvent cosTime cosNotification cosProperty
- cosFileTransfer cosEventDomain
- endif
-else
-#
-# unix and win32
-# --------------
-#
- ERTS_SUB_DIRECTORIES = stdlib sasl kernel compiler
- OTHER_SUB_DIRECTORIES = tools test_server common_test runtime_tools
- ifdef BUILD_ALL
- ifeq ($(findstring win32,$(TARGET)),win32) # BUILD_ALL on win32
- OTHER_SUB_DIRECTORIES += \
- snmp otp_mibs appmon erl_interface asn1 jinterface gs wx inets ic \
- mnesia crypto orber os_mon parsetools syntax_tools pman \
- public_key ssl toolbar tv observer debugger reltool odbc \
- diameter \
- cosTransactions cosEvent cosTime cosNotification cosProperty \
- cosFileTransfer cosEventDomain et megaco webtool \
- xmerl edoc eunit ssh inviso typer erl_docgen \
- common_test percept dialyzer
-# dialyzer
- OTHER_SUB_DIRECTORIES += hipe
- else # BUILD_ALL on unix
- OTHER_SUB_DIRECTORIES += \
- snmp otp_mibs appmon erl_interface asn1 jinterface wx debugger reltool gs inets \
+ERTS_SUB_DIRECTORIES = stdlib sasl kernel compiler
+OTHER_SUB_DIRECTORIES = tools test_server common_test runtime_tools
+ifdef BUILD_ALL
+ OTHER_SUB_DIRECTORIES += \
+ snmp otp_mibs appmon erl_interface asn1 jinterface \
+ wx debugger reltool gs inets \
ic mnesia crypto orber os_mon parsetools syntax_tools \
pman public_key ssl toolbar tv observer odbc \
diameter \
cosTransactions cosEvent cosTime cosNotification \
cosProperty cosFileTransfer cosEventDomain et megaco webtool \
xmerl edoc eunit ssh inviso typer erl_docgen \
- common_test percept dialyzer
-# dialyzer
- OTHER_SUB_DIRECTORIES += hipe $(TSP_APP)
- endif
- endif
+ percept dialyzer hipe
endif
ifdef BOOTSTRAP