make/Main.gmk

*** 485,505 ****
  ################################################################################
  #
  # Clean targets
  #
  ################################################################################
! 
! # If running a clean target, disable parallel execution
! ifneq ($(findstring clean, $(MAKECMDGOALS)), )
!   .NOTPARALLEL:
!   # It's not recommended to run additional targets to clean on the same make
!   # command line. Try to detect this and issue a warning.
!   ifneq ($(filter-out clean%, $(MAKECMDGOALS)), )
!     $(warning Mixing clean targets with normal build targets will not work well \
!         and is not recommended.)
!   endif
! endif
  
  CLEAN_COMPONENTS += langtools corba hotspot jdk nashorn images \
      bootcycle-build docs docstemp test
  CLEAN_TARGETS := $(addprefix clean-, $(CLEAN_COMPONENTS))
  
--- 485,496 ----
  ################################################################################
  #
  # Clean targets
  #
  ################################################################################
! # Clean targets are automatically run serially by the Makefile calling this 
! # file.
  
  CLEAN_COMPONENTS += langtools corba hotspot jdk nashorn images \
      bootcycle-build docs docstemp test
  CLEAN_TARGETS := $(addprefix clean-, $(CLEAN_COMPONENTS))
  
*** 541,550 ****
--- 532,544 ----
          @$(ECHO) "'make reconfigure'."
          @$(ECHO) "It may also be ignored by setting IGNORE_OLD_CONFIG=true"
          @if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
  endif
  
+ # The reconfigure target is automatically run serially from everything else
+ # by the Makefile calling this file.
+ 
  reconfigure:
          ifneq ($(CONFIGURE_COMMAND_LINE), )
            @$(ECHO) "Re-running configure using arguments '$(CONFIGURE_COMMAND_LINE)'"
          else
            @$(ECHO) "Re-running configure using default settings"