diff options
| author | Hans Bolinder <[email protected]> | 2016-07-07 09:08:16 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-07-07 09:08:16 +0200 |
| commit | ca4000874a198b218fd62b90e842475d2a0bb8c7 (patch) | |
| tree | d5d77cf4a1fa0adb47a36346a89ac08af482c569 /make | |
| parent | 62ef9f77d94563a03b8f1f5f1e8843f022329393 (diff) | |
| parent | 531708281a3a2cf336dc92651ede8d9d95f331cb (diff) | |
| download | otp-ca4000874a198b218fd62b90e842475d2a0bb8c7.tar.gz otp-ca4000874a198b218fd62b90e842475d2a0bb8c7.tar.bz2 otp-ca4000874a198b218fd62b90e842475d2a0bb8c7.zip | |
Merge branch 'hasse/erl_docgen/generated_type_links/ERL-120/OTP-13720' into maint
* hasse/erl_docgen/generated_type_links/ERL-120/OTP-13720:
wx: Prepare for using Erlang types and specs
syntax_tools: Improve types
syntax_tools: Improve seealso:s referring to types
erl_docgen: Allow 'seealso' in 'name'
erl_docgen: Generate type links in callback module creating erlref
erl_docgen: Correct callback module for creating erlref
erl_docgen: Improve callback module for creating erlref
edoc: Correct types
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp.mk.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/make/otp.mk.in b/make/otp.mk.in index c05c499d66..3b2e1a5bba 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -4,7 +4,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2013. All Rights Reserved. +# Copyright Ericsson AB 1997-2016. 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. @@ -271,6 +271,8 @@ SPECS_EXTRACTOR=$(DOCGEN)/priv/bin/specs_gen.escript # Extract specifications and types from Erlang source files (-spec, -type) $(SPECDIR)/specs_%.xml: $(SPECS_ESRC)/%.erl escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) -o$(dir $@) $< +$(SPECDIR)/specs_%.xml: $(SPECS_ESRC)/gen/%.erl + escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) -o$(dir $@) $< $(MAN1DIR)/%.1: %.xml |