1.1 --- a/common/makefiles/Main.gmk Wed Oct 09 18:51:32 2013 -0700
1.2 +++ b/common/makefiles/Main.gmk Thu Oct 10 14:58:19 2013 +0200
1.3 @@ -28,7 +28,7 @@
1.4 # Now load the spec
1.5 include $(SPEC)
1.6
1.7 -# Load the vital tools for all the makefiles.
1.8 +# Load the vital tools for all the makefiles.
1.9 include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
1.10
1.11 # Include the corresponding custom file, if present.
1.12 @@ -38,19 +38,19 @@
1.13
1.14 # Remove any build.log from a previous run, if they exist
1.15 ifneq (,$(BUILD_LOG))
1.16 - ifneq (,$(BUILD_LOG_PREVIOUS))
1.17 - # Rotate old log
1.18 - $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
1.19 - $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
1.20 - else
1.21 - $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
1.22 - endif
1.23 - $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
1.24 + ifneq (,$(BUILD_LOG_PREVIOUS))
1.25 + # Rotate old log
1.26 + $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
1.27 + $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
1.28 + else
1.29 + $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
1.30 + endif
1.31 + $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
1.32 endif
1.33 # Remove any javac server logs and port files. This
1.34 # prevents a new make run to reuse the previous servers.
1.35 ifneq (,$(SJAVAC_SERVER_DIR))
1.36 - $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
1.37 + $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
1.38 endif
1.39
1.40 # Reset the build timers.
1.41 @@ -103,8 +103,8 @@
1.42 @$(call TargetExit)
1.43
1.44 ifeq ($(BUILD_HOTSPOT),true)
1.45 -hotspot: hotspot-only
1.46 -hotspot-only: start-make
1.47 + hotspot: hotspot-only
1.48 + hotspot-only: start-make
1.49 @$(call TargetEnter)
1.50 @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
1.51 @$(call TargetExit)
1.52 @@ -149,9 +149,9 @@
1.53 @$(call TargetExit)
1.54
1.55 profiles-oscheck:
1.56 -ifneq ($(OPENJDK_TARGET_OS), linux)
1.57 - @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
1.58 -endif
1.59 + ifneq ($(OPENJDK_TARGET_OS), linux)
1.60 + @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
1.61 + endif
1.62
1.63 install: images install-only
1.64 install-only: start-make
1.65 @@ -202,12 +202,12 @@
1.66 dist-clean: clean
1.67 @($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
1.68 @$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
1.69 - if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
1.70 - $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ;\
1.71 - else \
1.72 - ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
1.73 - fi \
1.74 - )
1.75 + if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
1.76 + $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
1.77 + else \
1.78 + ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
1.79 + fi \
1.80 + )
1.81 @$(ECHO) Cleaned everything, you will have to re-run configure.
1.82
1.83 clean-langtools:
