diff options
| author | Sverker Eriksson <[email protected]> | 2019-02-06 19:10:26 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-02-06 19:10:26 +0100 |
| commit | 98cfd6016f8b40fc97e03b31177d14318349040f (patch) | |
| tree | c0fcdd768071c36bfbcbf186d369d9ca14c47421 /lib/Makefile | |
| parent | e2ca71b6e7172b320b5b171359d53a161383fb19 (diff) | |
| parent | 3825199794da28d79b21052a2e69e2335921d55e (diff) | |
| download | otp-98cfd6016f8b40fc97e03b31177d14318349040f.tar.gz otp-98cfd6016f8b40fc97e03b31177d14318349040f.tar.bz2 otp-98cfd6016f8b40fc97e03b31177d14318349040f.zip | |
Merge tag 'OTP-21.2' into sverker/map-from-ks-vs-bug
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/Makefile b/lib/Makefile index bc5d4cdcc1..cdb3f3f3dc 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1996-2016. All Rights Reserved. +# Copyright Ericsson AB 1996-2018. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -30,12 +30,11 @@ ERLANG_APPLICATIONS = tools common_test runtime_tools inets parsetools # These are only build if -a is given to otp_build or make is used directly ALL_ERLANG_APPLICATIONS = xmerl edoc erl_docgen snmp otp_mibs erl_interface \ asn1 jinterface \ - wx debugger reltool gs \ - ic mnesia crypto orber os_mon syntax_tools \ + wx debugger reltool \ + mnesia crypto os_mon syntax_tools \ public_key ssl observer odbc diameter \ - cosTransactions cosEvent cosTime cosNotification \ - cosProperty cosFileTransfer cosEventDomain et megaco \ - eunit ssh typer percept eldap dialyzer hipe + et megaco \ + eunit ssh eldap dialyzer hipe ftp tftp ifdef BUILD_ALL ERLANG_APPLICATIONS += $(ALL_ERLANG_APPLICATIONS) @@ -59,7 +58,7 @@ else SUB_DIRECTORIES = hipe parsetools asn1/src else ifdef TERTIARY_BOOTSTRAP - SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools wx + SUB_DIRECTORIES = snmp sasl jinterface syntax_tools wx else ifdef DOC_BOOTSTRAP SUB_DIRECTORIES = xmerl edoc erl_docgen |