comparison makefiles/Images.gmk @ 9040:f8b097b01270

Merge
author chegar
date Thu, 03 Oct 2013 19:07:42 +0100
parents 240072825ada 9bc1411d0223
children d7ef65d3ee57
comparison
equal deleted inserted replaced
29:db46bb24d915 32:aa472bb5ff1a
301 301
302 $(JDK_IMAGE_DIR)/jre/lib/applet: 302 $(JDK_IMAGE_DIR)/jre/lib/applet:
303 $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 303 $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
304 $(MKDIR) -p $@ 304 $(MKDIR) -p $@
305 305
306 # In the old build, JObjC.jar is not part of the meta-index
307 $(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS) 306 $(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS)
308 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 307 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
309 $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'` 308 $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
310 309
311 $(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS) 310 $(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS)
312 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 311 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
313 $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'` 312 $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
314 313
315 $(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS) 314 $(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS)
316 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 315 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
317 $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar 316 $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
318 317