equal
deleted
inserted
replaced
175 $(CD) $(GAMMADIR)/make; \ |
175 $(CD) $(GAMMADIR)/make; \ |
176 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT) |
176 $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT) |
177 |
177 |
178 $(CORE_VM_TARGETS): |
178 $(CORE_VM_TARGETS): |
179 $(CD) $(GAMMADIR)/make; \ |
179 $(CD) $(GAMMADIR)/make; \ |
180 $(MAKE) BUILD_DIR=$(CORE_DIR) BUILD_FLAVOR=$(@:$core=%) VM_TARGET=$@ generic_buildcore $(ALT_OUT) |
180 $(MAKE) BUILD_DIR=$(CORE_DIR) BUILD_FLAVOR=$(@:%core=%) VM_TARGET=$@ generic_buildcore $(ALT_OUT) |
181 |
181 |
182 $(ZERO_VM_TARGETS): |
182 $(ZERO_VM_TARGETS): |
183 $(CD) $(GAMMADIR)/make; \ |
183 $(CD) $(GAMMADIR)/make; \ |
184 $(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT) |
184 $(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT) |
185 |
185 |
476 endif |
476 endif |
477 |
477 |
478 # Core |
478 # Core |
479 ifeq ($(JVM_VARIANT_CORE), true) |
479 ifeq ($(JVM_VARIANT_CORE), true) |
480 # Common |
480 # Common |
481 $(EXPORT_LIB_DIR)/%.jar: $(CORE_DIR)/../generated/%.jar |
481 $(EXPORT_LIB_DIR)/%.jar: $(CORE_BUILD_DIR)/../generated/%.jar |
482 $(install-file) |
482 $(install-file) |
483 $(EXPORT_INCLUDE_DIR)/%: $(CORE_DIR)/../generated/jvmtifiles/% |
483 $(EXPORT_INCLUDE_DIR)/%: $(CORE_BUILD_DIR)/../generated/jvmtifiles/% |
484 $(install-file) |
484 $(install-file) |
485 # Unix |
485 # Unix |
486 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX) |
486 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_BUILD_DIR)/%.$(LIBRARY_SUFFIX) |
487 $(install-file) |
487 $(install-file) |
488 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo |
488 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(CORE_BUILD_DIR)/%.debuginfo |
489 $(install-file) |
489 $(install-file) |
490 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(CORE_DIR)/%.diz |
490 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(CORE_BUILD_DIR)/%.diz |
491 $(install-file) |
491 $(install-file) |
492 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_DIR)/%.$(LIBRARY_SUFFIX) |
492 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(CORE_BUILD_DIR)/%.$(LIBRARY_SUFFIX) |
493 $(install-file) |
493 $(install-file) |
494 $(EXPORT_SERVER_DIR)/%.debuginfo: $(CORE_DIR)/%.debuginfo |
494 $(EXPORT_SERVER_DIR)/%.debuginfo: $(CORE_BUILD_DIR)/%.debuginfo |
495 $(install-file) |
495 $(install-file) |
496 $(EXPORT_SERVER_DIR)/%.diz: $(CORE_DIR)/%.diz |
496 $(EXPORT_SERVER_DIR)/%.diz: $(CORE_BUILD_DIR)/%.diz |
497 $(install-file) |
497 $(install-file) |
498 endif |
498 endif |
499 |
499 |
500 # Shark |
500 # Shark |
501 ifeq ($(JVM_VARIANT_ZEROSHARK), true) |
501 ifeq ($(JVM_VARIANT_ZEROSHARK), true) |