Mercurial > hg > truffle

comparison make/Makefile @ 4812:dcc292399a39 hs23-b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 20 Jan 2012 16:56:31 -0800
parents 94ec88ca68e2
children 481a9443f721
comparison
equal deleted inserted replaced
4811:338d438ee229 4812:dcc292399a39
365 365
366 # Jar file (sa-jdi.jar) 366 # Jar file (sa-jdi.jar)
367 $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar 367 $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
368 $(install-file) 368 $(install-file)
369 369
370 # Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h) 370 # Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
371 $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/% 371 $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
372 $(install-file) 372 $(install-file)
373 373
374 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% 374 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
375 $(install-file) 375 $(install-file)
381 $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h: $(HS_JNI_ARCH_SRC) 381 $(EXPORT_INCLUDE_DIR)/$(JDK_INCLUDE_SUBDIR)/jni_md.h: $(HS_JNI_ARCH_SRC)
382 $(install-file) 382 $(install-file)
383 383
384 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/services/% 384 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/services/%
385 $(install-file) 385 $(install-file)
386
387 JFR_EXISTS=$(shell if [ -d $(HS_ALT_SRC) ]; then echo 1; else echo 0; fi)
388 # export jfr.h
389 ifeq ($JFR_EXISTS,1)
390 $(EXPORT_INCLUDE_DIR)/%: $(HS_ALT_SRC)/share/vm/jfr/agent/%
391 $(install-file)
392 else
393 $(EXPORT_INCLUDE_DIR)/jfr.h:
394
395 endif
386 396
387 # Doc files (jvmti.html) 397 # Doc files (jvmti.html)
388 $(EXPORT_DOCS_DIR)/platform/jvmti/%: $(DOCS_DIR)/% 398 $(EXPORT_DOCS_DIR)/platform/jvmti/%: $(DOCS_DIR)/%
389 $(install-file) 399 $(install-file)
390 400