--- a/make/Javadoc.gmk Thu Jul 07 18:34:58 2016 +0000
+++ b/make/Javadoc.gmk Fri Jul 08 08:55:54 2016 +0200
@@ -290,19 +290,15 @@
# Common javadoc options used by all bundles
-ifdef OPENJDK
- ADDITIONAL_JAVADOCFLAGS = \
- -Xdocrootparent $(DOCS_BASE_URL)
-else
- ADDITIONAL_JAVADOCFLAGS =
-endif
+# This flag may be overridden from a custom makefile
+DOCROOTPARENT_FLAG = -Xdocrootparent $(DOCS_BASE_URL)
define COMMON_JAVADOCFLAGS
$(call OptionOnly,-XDignore.symbol.file=true) ; \
$(call OptionOnly,-quiet) ; \
$(call OptionOnly,-use) ; \
$(call OptionOnly,-keywords) ; \
- $(call OptionOnly,$(ADDITIONAL_JAVADOCFLAGS))
+ $(call OptionOnly,$(DOCROOTPARENT_FLAG))
endef
# Common javadoc tags used by all bundles
@@ -1038,8 +1034,6 @@
MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
-JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
-JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/jdk.snmp/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
@@ -1063,11 +1057,6 @@
# Run javadoc if the index file is out of date or missing
$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
$(prep-javadoc)
- @if [ -f $(JVM_MIB_SRC) ] ; then \
- $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
- else \
- $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
- fi
$(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
$(JAVADOC_CMD_SMALL) -d $(@D) \
@$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
@@ -1704,3 +1693,7 @@
#############################################################
.PHONY: all docs coredocs otherdocs \
$(ALL_OTHER_TARGETS) zip-docs
+
+################################################################################
+
+$(eval $(call IncludeCustomExtension, , Javadoc-post.gmk))