make/jdk-rules.gmk

@@ -28,48 +28,25 @@
 ################################################################
 
 JDK_JAVA_EXE = $(OUTPUTDIR)/bin/java$(EXE_SUFFIX)
 
 # NO_IMAGES may be set in conjunction with DEV_ONLY
-ifdef NO_IMAGES
+IMAGES_TARGET = images
+ifdef DEV_ONLY
+  ifdef NO_IMAGES
   IMAGES_TARGET =
-else
-  IMAGES_TARGET = images
+  endif
 endif
 
-# No DOCS build when JDK_UPDATE_VERSION set
-ifdef JDK_UPDATE_VERSION
+# GENERATE_DOCS determines if we ask for the docs target
+DOCS_TARGET = docs
+ifeq ($(GENERATE_DOCS),false)
   DOCS_TARGET =
-else
-  DOCS_TARGET = docs
 endif
 
-# NO_DOCS may be set in conjunction with DEV_ONLY
-ifdef NO_DOCS
-  DOCS_TARGET =
-endif
+JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) $(IMAGES_TARGET)
 
-# If langtools not being built, full jdk javadoc is not possible
-ifneq ($(BUILD_LANGTOOLS), true)
-  DOCS_TARGET =
-endif
-ifneq ($(BUILD_CORBA), true)
-  DOCS_TARGET =
-endif
-ifneq ($(BUILD_JAXP), true)
-  DOCS_TARGET =
-endif
-ifneq ($(BUILD_JAXWS), true)
-  DOCS_TARGET =
-endif
-
-ifndef DEV_ONLY
-  JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
-else
-  JDK_BUILD_TARGETS = sanity all $(IMAGES_TARGET)
-endif
-
 JDK_CLOBBER_TARGETS = clobber
 
 JDK_BUILD_ARGUMENTS = $(COMMON_BUILD_ARGUMENTS) \
     ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)