make/Main.gmk

@@ -539,20 +539,20 @@
 CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \
     images make-support test-make bundles
 CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS))
 CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native
 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS))
-CLEAN_PHASES := gensrc java native include
+CLEAN_PHASES := gensrc java native include docs
 CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES))
 CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES))
 # Construct targets of the form clean-$module-$phase
 CLEAN_MODULE_PHASE_TARGETS := $(addprefix clean-, $(foreach m, $(ALL_MODULES), \
     $(addprefix $m-, $(CLEAN_PHASES))))
 
 # Remove everything, except the output from configure.
 clean: $(CLEAN_DIR_TARGETS)
-        ($(CD) $(OUTPUT_ROOT) && $(RM) -r source_tips build.log* build-trace*.log*)
+        ($(CD) $(OUTPUT_ROOT) && $(RM) -r build*.log*)
         $(ECHO) Cleaned all build artifacts.
 
 $(CLEAN_DIR_TARGETS):
         $(call CleanDir,$(patsubst clean-%, %, $@))
 

@@ -572,17 +572,15 @@
 # When removing the support dir, we must also remove jdk. Building classes has
 # the side effect of generating native headers. The headers end up in support
 # while classes and touch files end up in jdk.
 clean-support: clean-jdk
 
-clean-docs: clean-docstemp
-
-# Remove everything, including configure configuration.
-# If the output directory was created by configure and now becomes empty, remove it as well.
+# Remove everything, including configure configuration. If the output
+# directory was created by configure and now becomes empty, remove it as well.
 dist-clean: clean
-        ($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments \
-            Makefile compare.sh tmp javacservers)
+        ($(CD) $(OUTPUT_ROOT) && \
+            $(RM) -r *spec.gmk configure-support Makefile compare.sh ide)
         $(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
           if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
             $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
           else \
             ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" \