Merge branch 'master' of super:otp into bmk/snmp/compiler/misc/OTP-9618

3 files changed, 0 insertions, 296 deletions

diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index aa9431477c..df597c8ba7 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -28,14 +28,6 @@ VSN = $(SNMP_VSN)
 APPLICATION=snmp
 
 # ----------------------------------------------------
-# Include dependency
-# ----------------------------------------------------
-
-ifndef DOCSUPPORT
-include make.dep
-endif
-
-# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
@@ -88,40 +80,10 @@ MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6)
 MAN7_FILES = $(MIB_FILES:$(MIBSDIR)/%.mib=$(MAN7DIR)/%.7)
 
-ifdef DOCSUPPORT
-
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
-else
-
-TEX_FILES_BOOK = \
-	$(BOOK_FILES:%.xml=%.tex)
-TEX_FILES_REF_MAN = \
-	$(XML_REF1_FILES:%.xml=%.tex) \
-	$(XML_REF3_FILES:%.xml=%.tex) \
-	$(XML_REF6_FILES:%.xml=%.tex) \
-	$(XML_APPLICATION_FILES:%.xml=%.tex)
-TEX_PART_FILES = $(XML_PART_FILES:%.xml=%.tex)
-TEX_FILES_USERS_GUIDE = \
-	$(XML_CHAPTER_FILES:%.xml=%.tex)
-
-TOP_PDF_FILE = snmp-$(VSN).pdf
-TOP_PS_FILE  = snmp-$(VSN).ps
-
-$(TOP_PDF_FILE): book.dvi ../../vsn.mk
-	@echo "building $(TOP_PDF_FILE)"
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< | $(DISTILL) $(DISTILL_FLAGS) > $@
-
-$(TOP_PS_FILE): book.dvi ../../vsn.mk
-	@echo "building $(TOP_PS_FILE)"
-	$(DVI2PS) $(DVIPS_FLAGS) -f $< > $@
-
-TOP_HTML_FILES = $(INDEX_TARGET) 
-
-endif 
-
 INDEX_FILE   = index.html
 INDEX_SRC    = $(INDEX_FILE).src
 INDEX_TARGET = $(DOCDIR)/$(INDEX_FILE)
@@ -141,8 +103,6 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif			# Copy them to ../html
 	$(INSTALL_DATA) $< $@
 
-ifdef DOCSUPPORT
-
 docs: pdf html man
 
 ldocs: local_docs $(INDEX_TARGET)
@@ -157,47 +117,6 @@ html2: html $(INDEX_TARGET)
 clean clean_docs: clean_html clean_man clean_pdf
 	rm -f errs core *~
 
-else
-
-ifeq ($(DOCTYPE),pdf)
-docs: pdf
-else
-ifeq ($(DOCTYPE),ps)
-docs: ps
-else
-docs: html gifs man
-endif
-endif
-
-pdf: $(TOP_PDF_FILE)
-
-ps: $(TOP_PS_FILE)
-
-html: $(HTML_FILES) $(TOP_HTML_FILES) gifs 
-
-html2: gifs $(TOP_HTML_FILES) $(HTML_FILES) $(HTML_REF1_FILES) $(HTML_REF3_FILES) $(HTML_REF6_FILES) $(HTML_CHAP_FILES) 
-
-clean: clean_tex clean_html clean_man clean_docs
-
-
-clean_tex:
-	@echo "cleaning tex:"
-	rm -f $(TEX_FILES_USERS_GUIDE) 
-	rm -f $(TEX_FILES_REF_MAN) 
-	rm -f $(TEX_PART_FILES) 
-	rm -f $(TEX_FILES_BOOK)
-
-clean_docs: 
-	@echo "cleaning docs:"
-	rm -f $(TOP_PDF_FILE) 
-	rm -f $(TOP_PS_FILE)
-	rm -f core $(LATEX_CLEAN)
-
-
-$(HTML_PART_FILES): notes.xml
-
-endif
-
 $(INDEX_TARGET): $(INDEX_SRC) ../../vsn.mk	# Create top make file 
 	sed -e 's;%VSN%;$(VSN);' $< > $@	# inserting version number
 
@@ -250,8 +169,6 @@ $(MAN1DIR)/snmpc.1: snmpc_cmd.xml
 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-ifdef DOCSUPPORT
-
 release_docs_spec: docs
 	$(INSTALL_DIR) $(RELSYSDIR)/doc/pdf
 	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELSYSDIR)/doc/pdf
@@ -268,55 +185,13 @@ release_docs_spec: docs
 	$(INSTALL_DIR) $(RELEASE_PATH)/man/man7
 	$(INSTALL_DATA) $(MAN7DIR)/* $(RELEASE_PATH)/man/man7
 
-else
-
-
-ifeq ($(DOCTYPE),pdf)
-release_docs_spec: pdf
-	$(INSTALL_DIR) $(RELEASE_PATH)/pdf
-	$(INSTALL_DATA) $(TOP_PDF_FILE) $(RELEASE_PATH)/pdf
-else
-ifeq ($(DOCTYPE),ps)
-release_docs_spec: ps
-	$(INSTALL_DIR) $(RELEASE_PATH)/ps
-	$(INSTALL_DATA) $(TOP_PS_FILE) $(RELEASE_PATH)/ps
-else
-release_docs_spec: docs
-	$(INSTALL_DIR) $(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-		$(RELSYSDIR)/doc/html
-	$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DATA) $(MAN1_FILES) $(RELEASE_PATH)/man/man1
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DATA) $(MAN3_FILES) $(RELEASE_PATH)/man/man3
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DATA) $(MAN6_FILES) $(RELEASE_PATH)/man/man6
-	$(INSTALL_DIR) $(RELEASE_PATH)/man/man7
-	$(INSTALL_DATA) $(MAN7_FILES) $(RELEASE_PATH)/man/man7
-	$(INSTALL_DATA) $(TOP_HTML_FILES) \
-		$(RELSYSDIR)/doc
-endif
-endif
-
-endif 
-
 release_spec:
 
-ifdef DOCSUPPORT
 info: info_xml info_man info_html
 	@echo "MAN1DIR: $(MAN1DIR)"
 	@echo "MAN3DIR: $(MAN3DIR)"
 	@echo "MAN6DIR: $(MAN6DIR)"
 	@echo "MAN7DIR: $(MAN7DIR)"
-else
-info: info_xml info_man info_html info_tex
-	@echo "DVI2PS        = $(DVI2PS)"
-	@echo "DVIPS_FLAGS   = $(DVIPS_FLAGS)"
-	@echo ""
-	@echo "DISTILL       = $(DISTILL)"
-	@echo "DISTILL_FLAGS = $(DISTILL_FLAGS)"
-endif
 
 info_man: 
 	@echo "man files:"
@@ -362,14 +237,3 @@ info_html:
 	@echo "HTML_REF3_FILES = $(HTML_REF3_FILES)"
 	@echo "HTML_REF6_FILES = $(HTML_REF6_FILES)"
 	@echo "HTML_CHAP_FILES = $(HTML_CHAP_FILES)"
-
-info_tex: 
-	@echo "tex files:"
-	@echo "TEX_FILES_USERS_GUIDE = $(TEX_FILES_USERS_GUIDE)"
-	@echo "TEX_FILES_REF_MAN     = $(TEX_FILES_REF_MAN)"
-	@echo "TEX_PART_FILES        = $(TEX_PART_FILES)"
-	@echo "TEX_FILES_BOOK        = $(TEX_FILES_BOOK)"
-
-ifndef DOCSUPPORT
-include depend.mk
-endif
diff --git a/lib/snmp/doc/src/depend.mk b/lib/snmp/doc/src/depend.mk
deleted file mode 100644
index 20a523dd8c..0000000000
--- a/lib/snmp/doc/src/depend.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2004-2011. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-
-$(HTMLDIR)/part_notes.html: \
-	part_notes_history.xml \
-	part_notes.xml \
-	notes_history.xml \
-	notes.xml
-
-$(HTMLDIR)/part.html: \
-	part.xml \
-	snmp_intro.xml \
-	snmp_agent_funct_descr.xml \
-	snmp_manager_funct_descr.xml \
-	snmp_mib_compiler.xml \
-	snmp_config.xml \
-	snmp_agent_config_files.xml \
-	snmp_manager_config_files.xml \
-	snmp_impl_example_agent.xml \
-	snmp_impl_example_manager.xml \
-	snmp_instr_functions.xml \
-	snmp_def_instr_functions.xml \
-	snmp_agent_netif.xml \
-	snmp_manager_netif.xml \
-	snmp_audit_trail_log.xml \
-	snmp_advanced_agent.xml \
-	snmp_app_a.xml \
-	snmp_app_b.xml
-
-$(HTMLDIR)/ref_man.html: \
-	ref_man.xml \
-	snmp_app.xml \
-	snmp.xml \
-	snmpc.xml \
-	snmpc_cmd.xml \
-	snmpa.xml \
-	snmpa_conf.xml \
-	snmpa_discovery_handler.xml \
-	snmpa_error_report.xml \
-	snmpa_error.xml \
-	snmpa_error_io.xml \
-	snmpa_error_logger.xml \
-	snmpa_local_db.xml \
-	snmpa_mpd.xml \
-	snmpa_network_interface.xml \
-	snmpa_network_interface_filter.xml \
-	snmpa_notification_delivery_info_receiver.xml \
-	snmpa_notification_filter.xml \
-	snmpa_supervisor.xml \
-	snmp_community_mib.xml \
-	snmp_framework_mib.xml \
-	snmp_generic.xml \
-	snmp_index.xml \
-	snmp_notification_mib.xml \
-	snmp_pdus.xml \
-	snmp_standard_mib.xml \
-	snmp_target_mib.xml \
-	snmp_user_based_sm_mib.xml \
-	snmp_view_based_acm_mib.xml \
-	snmpm.xml \
-	snmpm_conf.xml \
-	snmpm_mpd.xml \
-	snmpm_network_interface.xml \
-	snmpm_network_interface_filter.xml \
-	snmpm_user.xml
-
-
diff --git a/lib/snmp/doc/src/make.dep b/lib/snmp/doc/src/make.dep
deleted file mode 100644
index 223e197f25..0000000000
--- a/lib/snmp/doc/src/make.dep
+++ /dev/null
@@ -1,77 +0,0 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2011. All Rights Reserved.
-# 
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
-# 
-# %CopyrightEnd%
-
-# ----------------------------------------------------
-# >>>> Do not edit this file <<<<
-# This file was automaticly generated by
-# /home/otp/bin/docdepend
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# TeX files that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: book.tex part.tex ref_man.tex snmp.tex snmp_advanced_agent.tex \
-		snmp_agent_config_files.tex snmp_agent_funct_descr.tex \
-		snmp_agent_netif.tex snmp_app.tex snmp_app_a.tex \
-		snmp_app_b.tex snmp_audit_trail_log.tex \
-		snmp_community_mib.tex \
-		snmp_config.tex snmp_def_instr_functions.tex \
-		snmp_framework_mib.tex snmp_generic.tex \
-		snmp_impl_example_agent.tex \
-		snmp_impl_example_manager.tex snmp_index.tex \
-		snmp_instr_functions.tex snmp_intro.tex \
-		snmp_manager_config_files.tex \
-		snmp_manager_funct_descr.tex snmp_manager_netif.tex \
-		snmp_mib_compiler.tex snmp_notification_mib.tex \
-		snmp_pdus.tex snmp_standard_mib.tex snmp_target_mib.tex \
-		snmp_user_based_sm_mib.tex snmp_view_based_acm_mib.tex \
-		snmpa.tex snmpa_conf.tex snmpa_error.tex snmpa_error_io.tex \
-		snmpa_error_logger.tex snmpa_error_report.tex \
-		snmpa_local_db.tex snmpa_mpd.tex \
-		snmpa_discovery_handler.tex \
-		snmpa_network_interface.tex \
-		snmpa_network_interface_filter.tex \
-		snmpa_notification_delivery_info_receiver.tex \
-		snmpa_notification_filter.tex \
-		snmpa_supervisor.tex \
-		snmpc.tex snmpc_cmd.tex snmpm.tex snmpm_conf.tex snmpm_mpd.tex \
-		snmpm_network_interface.tex snmpm_network_interface_filter.tex \
-		snmpm_user.tex
-
-# ----------------------------------------------------
-# Source inlined when transforming from source to LaTeX
-# ----------------------------------------------------
-
-book.tex: ref_man.xml
-
-# ----------------------------------------------------
-# Pictures that the DVI file depend on
-# ----------------------------------------------------
-
-book.dvi: MIB_mechanism.ps snmp-um-1-image-1.ps snmp-um-1-image-2.ps \
-		snmp-um-1-image-3.ps
-
-book.dvi: snmp_agent_netif_1.ps
-
-book.dvi: getnext1.ps getnext2.ps getnext3.ps getnext4.ps
-
-book.dvi: snmp_manager_netif_1.ps
-