< prev index next >

make/Main.gmk

Print this page

        

@@ -338,14 +338,14 @@
         +($(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
+zip-docs:
         +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs)
 
-ALL_TARGETS += docs-javadoc docs-jvmtidoc
+ALL_TARGETS += docs-javadoc docs-jvmtidoc zip-docs
 
 ################################################################################
 # Cross compilation support
 
 ifeq ($(CREATE_BUILDJDK), true)

@@ -600,10 +600,12 @@
 
   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,11 +703,11 @@
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   product-images: mac-bundles
 endif
 
 # This target builds the documentation image
-docs-image: zip-docs
+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,11 +727,11 @@
 jdk: exploded-image
 images: product-images
 docs: docs-image
 all: all-images
 
-ALL_TARGETS += default jdk images docs all zip-docs
+ALL_TARGETS += default jdk images docs all
 
 ################################################################################
 ################################################################################
 #
 # Clean targets
< prev index next >