diff -r 63fbc565bba5 -r 98ce0879ab4c make/Jprt.gmk --- a/make/Jprt.gmk Sun Aug 10 19:38:50 2014 -0700 +++ b/make/Jprt.gmk Sun Aug 17 15:51:37 2014 +0100 @@ -52,7 +52,6 @@ # This target must be called in the context of a SPEC file jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) - @$(call CheckIfMakeAtEnd) # This target must be called in the context of a SPEC file $(JPRT_ARCHIVE_BUNDLE): bundles @@ -66,8 +65,7 @@ SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) # Bundle up the images -bundles: all bundles-only -bundles-only: start-make +bundles: all @$(call TargetEnter) $(MKDIR) -p $(BUILD_OUTPUT)/bundles $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . @@ -78,8 +76,7 @@ @$(call TargetExit) # Copy images to one unified location regardless of platform etc. -final-images: all final-images-only -final-images-only: start-make +final-images: all @$(call TargetEnter) $(RM) -r $(BUILD_OUTPUT)/final-images $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR) @@ -97,4 +94,4 @@ ########################################################################### # Phony targets -.PHONY: jprt_bundle bundles bundles-only final-images final-images-only +.PHONY: jprt_bundle bundles final-images