make/Javadoc.gmk

@@ -172,10 +172,11 @@
     -tag 'implSpec:a:Implementation Requirements:' \
     -tag 'implNote:a:Implementation Note:' \
     -tag param \
     -tag return \
     -tag throws \
+    -taglet build.tools.taglet.ModuleGraph \
     -tag since \
     -tag version \
     -tag serialData \
     -tag factory \
     -tag see \

@@ -186,10 +187,15 @@
     #
 
 DEFAULT_JAVADOC_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
     -serialwarn -encoding ISO-8859-1 -breakiterator --system none
 
+#
+# TODO: this should be set by the configure option.
+#
+JAVADOC_MODULE_GRAPH=false
+
 ################################################################################
 # Setup make rules for running javadoc.
 #
 # Parameter 1 is the name of the rule. This name is used as variable prefix,
 # and the targets generated are listed in a variable by that name. Note that

@@ -319,11 +325,12 @@
         $$(call MakeDir, $$(@D))
         ifneq ($$($1_PACKAGES_FILE), )
           $$(eval $$(call ListPathsSafely, $1_PACKAGES, $$($1_PACKAGES_FILE)))
         endif
         $$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/docs/$1.javadoc, \
-            $$($1_JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) -d $$(@D) \
+            $$($1_JAVA) -Djava.awt.headless=true -DenableModuleGraph=$(JAVADOC_MODULE_GRAPH) \
+                $(NEW_JAVADOC) -d $$(@D) \
                 $$(DEFAULT_JAVADOC_TAGS) $$(DEFAULT_JAVADOC_OPTIONS) \
                 --module-source-path $$(call PathList, $$(JAVADOC_SOURCE_DIRS)) \
                 $$($1_OPTIONS) $$($1_PACKAGES_ARG))
 
   # The output returned will be the index.html file