diff options
| author | Micael Karlberg <[email protected]> | 2019-06-24 09:43:58 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-06-24 12:38:32 +0200 |
| commit | 878741953069a8d0a7d683cf2b7cbbfe957e880d (patch) | |
| tree | dfc12435fe1a196b84c4e121400bf6cea647b4ac /erts | |
| parent | 55685630a4c2edccda1954e4bfb2ee590a4467f9 (diff) | |
| download | otp-878741953069a8d0a7d683cf2b7cbbfe957e880d.tar.gz otp-878741953069a8d0a7d683cf2b7cbbfe957e880d.tar.bz2 otp-878741953069a8d0a7d683cf2b7cbbfe957e880d.zip | |
[esock] More doc woes
Also needed to take care of the specs files (in erts and kernel docs).
Also, ifdef'ing the net module adjusted (again).
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/Makefile | 11 | ||||
| -rw-r--r-- | erts/doc/src/specs.xml.src (renamed from erts/doc/src/specs.xml) | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile index 735084b345..bb96293947 100644 --- a/erts/doc/src/Makefile +++ b/erts/doc/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2018. All Rights Reserved. +# Copyright Ericsson AB 1997-2019. 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. @@ -51,11 +51,13 @@ ifeq ($(USE_ESOCK), yes) XML_REF3_ESOCK_EFILES = socket.xml XML_CHAPTER_ESOCK_EFILES = socket_usage.xml ESOCK_USE_SOCKET_XML=<xi:include href="socket.xml"\/> +ESOCK_USE_SOCKET_SPECS_XML=<xi:include href="../specs/specs_socket.xml"/> ESOCK_USE_SOCKET_USAGE_XML=<xi:include href="socket_usage.xml"/> else XML_REF3_ESOCK_EFILES = XML_CHAPTER_ESOCK_EFILES = ESOCK_USE_SOCKET_XML = +ESOCK_USE_SOCKET_SPECS_XML = ESOCK_USE_SOCKET_USAGE_XML = endif @@ -170,7 +172,7 @@ $(HTMLDIR)/%.gif: %.gif $(XML_FIGURE_DIR)/%.png: ../../emulator/internal_doc/figures/%.png $(INSTALL_DATA) $< $@ -docs: part ref_man figures man pdf html $(INFO_FILE) +docs: part ref_man specs figures man pdf html $(INFO_FILE) $(TOP_PDF_FILE): $(XML_FILES) @@ -182,6 +184,7 @@ man: $(MAN1_FILES) $(MAN3_FILES) ref_man: ref_man.xml part: part.xml +specs: specs.xml gifs: $(GIF_FILES:%=$(HTMLDIR)/%) @@ -218,6 +221,10 @@ part.xml: part.xml.src ($(PERL) -p -e 's?%ESOCK_USE_SOCKET_USAGE_XML%?$(ESOCK_USE_SOCKET_USAGE_XML)?' \ $<) > $@ +specs.xml: specs.xml.src + ($(PERL) -p -e 's?%ESOCK_USE_SOCKET_SPECS_XML%?$(ESOCK_USE_SOCKET_SPECS_XML)?' \ + $<) > $@ + # ---------------------------------------------------- # Release Target diff --git a/erts/doc/src/specs.xml b/erts/doc/src/specs.xml.src index 68fab5edf1..54224c15f5 100644 --- a/erts/doc/src/specs.xml +++ b/erts/doc/src/specs.xml.src @@ -5,8 +5,7 @@ <xi:include href="../specs/specs_erl_tracer.xml"/> <xi:include href="../specs/specs_init.xml"/> <xi:include href="../specs/specs_persistent_term.xml"/> - <xi:include href="../specs/specs_socket.xml"/> - <xi:include href="../specs/specs_net.xml"/> + %ESOCK_USE_SOCKET_SPECS_XML% <xi:include href="../specs/specs_zlib.xml"/> <xi:include href="../specs/specs_atomics.xml"/> <xi:include href="../specs/specs_counters.xml"/> |