--- a/make/Javadoc.gmk Tue Apr 25 07:54:11 2017 -0700
+++ b/make/Javadoc.gmk Wed Apr 26 14:34:09 2017 +0200
@@ -35,6 +35,11 @@
$(eval $(call ReadImportMetaData))
################################################################################
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, , Javadoc.gmk))
+
+################################################################################
# Javadoc settings
# On top of the sources that was used to compile the JDK, we need some
@@ -43,7 +48,7 @@
$(SUPPORT_OUTPUTDIR)/rmic/* $(JDK_TOPDIR)/src/*/share/doc/stub)
# Should we use -Xdocrootparent? Allow custom to overwrite.
-DOCROOTPARENT_FLAG = TRUE
+DOCROOTPARENT_FLAG ?= TRUE
# URLs
JAVADOC_BASE_URL := http://docs.oracle.com/javase/$(VERSION_SPECIFICATION)/docs
@@ -77,6 +82,7 @@
-taglet build.tools.taglet.ExtLink \
-taglet build.tools.taglet.Incubating \
-tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+ $(CUSTOM_JAVADOC_TAGS) \
#
# Which doclint checks to ignore
@@ -218,7 +224,7 @@
$1_OPTIONS += -Xdoclint:all,$$(call CommaList, $$(addprefix -, \
$$(JAVADOC_DISABLED_DOCLINT)))
- ifneq ($$($$DOCROOTPARENT_FLAG), )
+ ifeq ($$($$DOCROOTPARENT_FLAG), TRUE)
$1_OPTIONS += -Xdocrootparent $$(JAVADOC_BASE_URL)
endif
@@ -430,11 +436,6 @@
################################################################################
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , Javadoc.gmk))
-
-################################################################################
-
docs-jdk-api-javadoc: $(JDK_API_JAVADOC_TARGETS)
docs-jdk-api-modulegraph: $(JDK_API_MODULEGRAPH_TARGETS)