changeset 6057:9f9499bb263a

8014129: makefile changes to allow integration of new features Reviewed-by: tbell, robilad
author aywang
date Thu, 09 May 2013 15:43:25 -0700
parents 44eb69320403
children 1181ca946735
files make/com/oracle/jfr/Makefile make/common/Release.gmk
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/com/oracle/jfr/Makefile	Tue Sep 18 13:14:49 2012 +0100
+++ b/make/com/oracle/jfr/Makefile	Thu May 09 15:43:25 2013 -0700
@@ -73,8 +73,9 @@
 
 JFC_FILES := $(subst $(JFC_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFC_SRCDIR)/*.jfc))
 
+-include ${JDK_TOPDIR}/make/closed/common/jfr.gmk
+
 $(JFC_XSD_FILE) : $(JFC_XSD_SRC)
 	$(install-file)
 
-all build : $(JFC_FILES) $(JFC_XSD_FILE)
-
+all build: $(JFC_FILES) $(JFC_XSD_FILE)
--- a/make/common/Release.gmk	Tue Sep 18 13:14:49 2012 +0100
+++ b/make/common/Release.gmk	Thu May 09 15:43:25 2013 -0700
@@ -1236,6 +1236,11 @@
 $(PRINTF) '%s="%s"\n' $1 $2 >> $@
 endef
 
+define echo-java-info
+$(CAT) $1
+endef
+-include $(JDK_TOPDIR)/make/closed/common/release.gmk
+
 # Values to emit
 MINIMUM_OS_NAME    := $(REQUIRED_OS_NAME)
 MINIMUM_OS_VERSION := $(REQUIRED_OS_VERSION)
@@ -1252,6 +1257,7 @@
 	$(call info-file-item, "OS_VERSION",   "$(MINIMUM_OS_VERSION)")
 	$(call info-file-item, "OS_ARCH",      "$(MINIMUM_OS_ARCH)")
 	$(call info-file-item, "SOURCE",       "$(ALL_SOURCE_TIPS)")
+	$(call echo-java-info, $@)
 
 # Create release file to identify this image
 identify-image-jdk:: $(JDK_INFO_FILE)
@@ -1263,6 +1269,7 @@
 	$(call info-file-item, "OS_VERSION",   "$(MINIMUM_OS_VERSION)")
 	$(call info-file-item, "OS_ARCH",      "$(MINIMUM_OS_ARCH)")
 	$(call info-file-item, "SOURCE",       "$(ALL_SOURCE_TIPS)")
+	$(call echo-java-info, $@)
 
 # Create release file to identify this image
 identify-image-jre:: $(JRE_INFO_FILE)