diff options
| author | Rickard Green <[email protected]> | 2014-02-21 11:34:48 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-02-21 11:34:48 +0100 |
| commit | 2b7d4bebe6d7ecf79d78ead792237a458798be5f (patch) | |
| tree | 41f7e09f26207eee7c7f4a2123583dd07d7a506a /lib | |
| parent | dd298cc2d6b21e8c387ac525bd678f0dfa8853f3 (diff) | |
| parent | f51da9be40b578cdf386264312eb9b37d18ce778 (diff) | |
| download | otp-2b7d4bebe6d7ecf79d78ead792237a458798be5f.tar.gz otp-2b7d4bebe6d7ecf79d78ead792237a458798be5f.tar.bz2 otp-2b7d4bebe6d7ecf79d78ead792237a458798be5f.zip | |
Merge branch 'rickard/doc-build/OTP-11713'
* rickard/doc-build/OTP-11713:
Build documentation with bootstrap system
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/Makefile b/lib/Makefile index 6301c882b2..4b979fc28a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -25,10 +25,11 @@ ERTS_APPLICATIONS = stdlib sasl kernel compiler # Then these have to be build ERLANG_APPLICATIONS = tools test_server common_test runtime_tools \ - inets xmerl edoc erl_docgen parsetools + inets parsetools # These are only build if -a is given to otp_build or make is used directly -ALL_ERLANG_APPLICATIONS = snmp otp_mibs erl_interface asn1 jinterface \ +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 \ public_key ssl observer odbc diameter \ @@ -59,10 +60,14 @@ else else ifdef TERTIARY_BOOTSTRAP SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools wx - else # Not bootstrap build - SUB_DIRECTORIES = $(ERTS_APPLICATIONS) \ - $(ERLANG_APPLICATIONS) \ - $(EXTRA_APPLICATIONS) + else + ifdef DOC_BOOTSTRAP + SUB_DIRECTORIES = xmerl edoc erl_docgen + else # Not bootstrap build + SUB_DIRECTORIES = $(ERTS_APPLICATIONS) \ + $(ERLANG_APPLICATIONS) \ + $(EXTRA_APPLICATIONS) + endif endif endif endif |