make/Main.gmk

*** 338,351 ****
          +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
  
  docs-jvmtidoc:
          +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk jvmtidocs)
  
! zip-docs: docs-javadoc docs-jvmtidoc
          +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs)
  
! ALL_TARGETS += docs-javadoc docs-jvmtidoc
  
  ################################################################################
  # Cross compilation support
  
  ifeq ($(CREATE_BUILDJDK), true)
--- 338,351 ----
          +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
  
  docs-jvmtidoc:
          +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk jvmtidocs)
  
! zip-docs:
          +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs)
  
! ALL_TARGETS += docs-javadoc docs-jvmtidoc zip-docs
  
  ################################################################################
  # Cross compilation support
  
  ifeq ($(CREATE_BUILDJDK), true)
*** 600,609 ****
--- 600,611 ----
  
    docs-javadoc: $(GENSRC_TARGETS) rmic
  
    docs-jvmtidoc: hotspot
  
+   zip-docs: docs-javadoc docs-jvmtidoc
+ 
    test: jimages test-image
  
    create-buildjdk-copy: jdk.jlink-java java.base-gendata
  
    create-buildjdk-compile-modules: create-buildjdk-copy create-buildjdk-compile-hotspot
*** 701,711 ****
  ifeq ($(OPENJDK_TARGET_OS), macosx)
    product-images: mac-bundles
  endif
  
  # This target builds the documentation image
! docs-image: zip-docs
  
  # This target builds the test image
  test-image: prepare-test-image test-image-hotspot-jtreg-native \
      test-image-jdk-jtreg-native test-image-failure-handler
  
--- 703,713 ----
  ifeq ($(OPENJDK_TARGET_OS), macosx)
    product-images: mac-bundles
  endif
  
  # This target builds the documentation image
! docs-image: docs-javadoc docs-jvmtidoc
  
  # This target builds the test image
  test-image: prepare-test-image test-image-hotspot-jtreg-native \
      test-image-jdk-jtreg-native test-image-failure-handler
  
*** 725,735 ****
  jdk: exploded-image
  images: product-images
  docs: docs-image
  all: all-images
  
! ALL_TARGETS += default jdk images docs all zip-docs
  
  ################################################################################
  ################################################################################
  #
  # Clean targets
--- 727,737 ----
  jdk: exploded-image
  images: product-images
  docs: docs-image
  all: all-images
  
! ALL_TARGETS += default jdk images docs all
  
  ################################################################################
  ################################################################################
  #
  # Clean targets