Mercurial > hg > truffle
comparison make/Makefile @ 9956:8ad4e90fc5d7
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Mon, 10 Jun 2013 08:44:25 +0200 |
parents | 2a091d2987bd |
children | 8dc4cdde75fb |
comparison
equal
deleted
inserted
replaced
9955:de73bbbde021 | 9956:8ad4e90fc5d7 |
---|---|
514 | 514 |
515 # Shared jar files | 515 # Shared jar files |
516 $(EXPORT_JRE_LIB_DIR)/%.jar: $(SHARED_DIR)/%.jar | 516 $(EXPORT_JRE_LIB_DIR)/%.jar: $(SHARED_DIR)/%.jar |
517 $(install-file) | 517 $(install-file) |
518 | 518 |
519 # Shared options files | |
520 $(EXPORT_JRE_LIB_DIR)/%.options: $(SHARED_DIR)/%.options | |
521 $(install-file) | |
522 | |
519 # Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h) | 523 # Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h) |
520 $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/% | 524 $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/% |
521 $(install-file) | 525 $(install-file) |
522 | 526 |
523 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% | 527 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% |