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 /lib/syntax_tools/doc/src | |
| 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 'lib/syntax_tools/doc/src')
| -rw-r--r-- | lib/syntax_tools/doc/src/Makefile | 8 | ||||
| -rw-r--r-- | lib/syntax_tools/doc/src/specs.xml | 14 |
2 files changed, 21 insertions, 1 deletions
diff --git a/lib/syntax_tools/doc/src/Makefile b/lib/syntax_tools/doc/src/Makefile index ff4f3f78ff..e55222e59c 100644 --- a/lib/syntax_tools/doc/src/Makefile +++ b/lib/syntax_tools/doc/src/Makefile @@ -81,10 +81,15 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf +SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml) + +TOP_SPECS_FILE = specs.xml + # ---------------------------------------------------- # FLAGS # ---------------------------------------------------- XML_FLAGS += +SPECS_FLAGS = -I../../include DVIPS_FLAGS += # ---------------------------------------------------- @@ -93,7 +98,7 @@ DVIPS_FLAGS += $(HTMLDIR)/%.gif: %.gif $(INSTALL_DATA) $< $@ -docs: pdf html man +docs: man pdf html $(TOP_PDF_FILE): $(XML_FILES) @@ -120,6 +125,7 @@ clean clean_docs: rm -f $(MAN3DIR)/* rm -f $(XML_REF3_FILES) $(XML_CHAPTER_FILES) *.html rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo) + rm -f $(SPECDIR)/* rm -f errs core *~ # ---------------------------------------------------- diff --git a/lib/syntax_tools/doc/src/specs.xml b/lib/syntax_tools/doc/src/specs.xml new file mode 100644 index 0000000000..04c3a494e7 --- /dev/null +++ b/lib/syntax_tools/doc/src/specs.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" ?> +<specs xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="../specs/specs_epp_dodger.xml"/> + <xi:include href="../specs/specs_erl_comment_scan.xml"/> + <xi:include href="../specs/specs_erl_prettypr.xml"/> + <xi:include href="../specs/specs_erl_recomment.xml"/> + <xi:include href="../specs/specs_erl_syntax.xml"/> + <xi:include href="../specs/specs_erl_syntax_lib.xml"/> + <xi:include href="../specs/specs_erl_tidy.xml"/> + <xi:include href="../specs/specs_igor.xml"/> + <xi:include href="../specs/specs_merl.xml"/> + <xi:include href="../specs/specs_merl_transform.xml"/> + <xi:include href="../specs/specs_prettypr.xml"/> +</specs> |