make/Javadoc.gmk

*** 42,53 ****
  
  #
  # Definitions for directories
  #
  
! DOCSDIR := $(OUTPUT_ROOT)/docs
! TEMPDIR := $(OUTPUT_ROOT)/docstemp
  
  HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
  
  BUILD_NUMBER=$(JDK_BUILD_NUMBER)
  
--- 42,53 ----
  
  #
  # Definitions for directories
  #
  
! DOCSDIR := $(IMAGES_OUTPUTDIR)/docs
! DOCSTMPDIR = $(SUPPORT_OUTPUTDIR)/docs
  
  HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
  
  BUILD_NUMBER=$(JDK_BUILD_NUMBER)
  
*** 140,152 ****
        $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS_API_DIR)/classes \
        $(LANGTOOLS_TOPDIR)/src/*/share/classes \
        $(CORBA_TOPDIR)/src/*/share/classes \
        $(JAXP_TOPDIR)/src/*/share/classes \
        $(JAXWS_TOPDIR)/src/*/share/classes \
!       $(JDK_OUTPUTDIR)/gensrc/j* \
!       $(JDK_OUTPUTDIR)/gendocsrc_rmic \
!       $(CORBA_OUTPUTDIR)/gensrc/j* \
        $(JDK_TOPDIR)/src/*/share/doc/stub \
        ) \
        #
  
  # List with classpath separator between them
--- 140,151 ----
        $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS_API_DIR)/classes \
        $(LANGTOOLS_TOPDIR)/src/*/share/classes \
        $(CORBA_TOPDIR)/src/*/share/classes \
        $(JAXP_TOPDIR)/src/*/share/classes \
        $(JAXWS_TOPDIR)/src/*/share/classes \
!       $(SUPPORT_OUTPUTDIR)/gensrc/j* \
!       $(SUPPORT_OUTPUTDIR)/rmic/j* \
        $(JDK_TOPDIR)/src/*/share/doc/stub \
        ) \
        #
  
  # List with classpath separator between them
*** 202,212 ****
  endef
  
  #
  # Temporary directory for javadoc creation
  #
- DOCSTMPDIR = $(TEMPDIR)/doctmp
  
  #
  # Different api directories created from root directory
  #
  COREAPI_DOCSDIR = $(DOCSDIR)/api
--- 201,210 ----
*** 269,279 ****
  define COMMON_JAVADOCFLAGS
      $(call OptionOnly,-XDignore.symbol.file=true) ; \
      $(call OptionOnly,-quiet) ; \
      $(call OptionOnly,-use) ; \
      $(call OptionOnly,-keywords) ; \
-     $(call OptionPair,-Xprofilespath,$(JDK_TOPDIR)/make/profile-rtjar-includes.txt) ; \
      $(call OptionOnly,$(ADDITIONAL_JAVADOCFLAGS))
  endef
  
  # Common javadoc tags used by all bundles
  
--- 267,276 ----
*** 666,676 ****
  ALL_OTHER_TARGETS += jdwpdocs
  
  JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
  
  jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
! $(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
          $(MKDIR) -p $(@D)
          $(RM) $@
          $(CP) $< $@
  
  #############################################################
--- 663,673 ----
  ALL_OTHER_TARGETS += jdwpdocs
  
  JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
  
  jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
! $(JDWP_DOCDIR)/jdwp-protocol.html : $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html
          $(MKDIR) -p $(@D)
          $(RM) $@
          $(CP) $< $@
  
  #############################################################