makefiles/Images.gmk

@@ -48,13 +48,11 @@
 images:: jre-image jdk-image
 
 overlay-images: jre-overlay-image jdk-overlay-image
 
 
--include $(CUSTOM_MAKE_DIR)/Images.gmk
 
-
 # Processing license files from source area to image area
 # These will be modified to have the platform specific EOL chars.
 define process-doc-file
         $(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
         $(MKDIR) -p $(@D)

@@ -624,11 +622,11 @@
 ALL_SOURCE_TIPS = $(shell \
   if [ -f $(OUTPUT_ROOT)/source_tips ] ; then \
     $(CAT) $(OUTPUT_ROOT)/source_tips ; \
   fi)
 
-$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
+$(JRE_INFO_FILE) : $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
         $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
         $(call create-info-file)
 ifneq ($(PROFILE),)
         $(call info-file-item, "JAVA_PROFILE", "$(call profile_name, $(call profile_number, $(PROFILE)))")
 endif

@@ -772,5 +770,7 @@
 endif # Profile
 
 ################################################################################
 
 .PHONY: default images jre-image jdk-image
+
+-include $(CUSTOM_MAKE_DIR)/Images.gmk