make/Makefile

changeset 3427
94ec88ca68e2
parent 3202
436b4a3231bf
child 3492
481a9443f721
     1.1 --- a/make/Makefile	Mon Jan 09 10:27:24 2012 +0100
     1.2 +++ b/make/Makefile	Wed Jan 11 17:34:02 2012 -0500
     1.3 @@ -367,7 +367,7 @@
     1.4  $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
     1.5  	$(install-file)
     1.6  
     1.7 -# Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h)
     1.8 +# Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
     1.9  $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
    1.10  	$(install-file)
    1.11  
    1.12 @@ -384,6 +384,16 @@
    1.13  $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/services/%
    1.14  	$(install-file)
    1.15  
    1.16 +JFR_EXISTS=$(shell if [ -d $(HS_ALT_SRC) ]; then echo 1; else echo 0; fi)
    1.17 +# export jfr.h
    1.18 +ifeq ($JFR_EXISTS,1)
    1.19 +$(EXPORT_INCLUDE_DIR)/%: $(HS_ALT_SRC)/share/vm/jfr/agent/%
    1.20 +	$(install-file)
    1.21 +else
    1.22 +$(EXPORT_INCLUDE_DIR)/jfr.h:
    1.23 +	
    1.24 +endif
    1.25 +
    1.26  # Doc files (jvmti.html)
    1.27  $(EXPORT_DOCS_DIR)/platform/jvmti/%: $(DOCS_DIR)/%
    1.28  	$(install-file)

mercurial