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 /lib/kernel/doc/src | |
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 'lib/kernel/doc/src')
-rw-r--r-- | lib/kernel/doc/src/Makefile | 8 | ||||
-rw-r--r-- | lib/kernel/doc/src/specs.xml.src (renamed from lib/kernel/doc/src/specs.xml) | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile index 817f592ad4..70623ab9aa 100644 --- a/lib/kernel/doc/src/Makefile +++ b/lib/kernel/doc/src/Makefile @@ -41,8 +41,10 @@ XML_APPLICATION_FILES = ref_man.xml ifeq ($(USE_ESOCK),yes) XML_REF3_ESOCK_FILES = net.xml ESOCK_USE_NET_XML=<xi:include href="net.xml"\/> +ESOCK_USE_NET_SPECS_XML=<xi:include href="../specs/specs_net.xml"/> else XML_REF3_ESOCK_FILES = +ESOCK_USE_NET_SPECS_XML = ESOCK_USE_NET_XML = endif @@ -150,7 +152,7 @@ SPECS_FLAGS = -I../../include $(HTMLDIR)/%: % $(INSTALL_DATA) $< $@ -docs: ref_man man pdf html +docs: ref_man specs man pdf html $(TOP_PDF_FILE): $(XML_FILES) @@ -161,6 +163,7 @@ html: images $(HTML_REF_MAN_FILE) man: $(MAN3_FILES) $(MAN4_FILES) $(MAN6_FILES) ref_man: ref_man.xml +specs: specs.xml images: $(IMAGE_FILES:%=$(HTMLDIR)/%) @@ -202,6 +205,9 @@ $(SPECDIR)/specs_zlib_stub.xml: ref_man.xml: ref_man.xml.src ($(PERL) -p -e 's?%ESOCK_USE_NET_XML%?$(ESOCK_USE_NET_XML)?' \ $<) > $@ +specs.xml: specs.xml.src + ($(PERL) -p -e 's?%ESOCK_USE_NET_SPECS_XML%?$(ESOCK_USE_NET_SPECS_XML)?' \ + $<) > $@ # ---------------------------------------------------- diff --git a/lib/kernel/doc/src/specs.xml b/lib/kernel/doc/src/specs.xml.src index 9e258910db..ccb26b9458 100644 --- a/lib/kernel/doc/src/specs.xml +++ b/lib/kernel/doc/src/specs.xml.src @@ -26,7 +26,7 @@ <xi:include href="../specs/specs_logger_formatter.xml"/> <xi:include href="../specs/specs_logger_std_h.xml"/> <xi:include href="../specs/specs_logger_disk_log_h.xml"/> - <xi:include href="../specs/specs_net.xml"/> + %ESOCK_USE_NET_SPECS_XML% <xi:include href="../specs/specs_net_adm.xml"/> <xi:include href="../specs/specs_net_kernel.xml"/> <xi:include href="../specs/specs_os.xml"/> |