diff options
| author | Hans Bolinder <[email protected]> | 2016-07-07 09:24:54 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-07-07 09:24:54 +0200 |
| commit | 269dae49056d29c65add089deffebf27b86980c3 (patch) | |
| tree | 5caf13b8643b0e27d11ca40f92361a0f69302ba7 /make | |
| parent | ae2f69f3320ce0037d83906cbcee68caeeb2937d (diff) | |
| parent | ca4000874a198b218fd62b90e842475d2a0bb8c7 (diff) | |
| download | otp-269dae49056d29c65add089deffebf27b86980c3.tar.gz otp-269dae49056d29c65add089deffebf27b86980c3.tar.bz2 otp-269dae49056d29c65add089deffebf27b86980c3.zip | |
Merge branch 'maint'
* maint:
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 |