# HG changeset patch # User erikj # Date 1372145116 -7200 # Node ID 48432b1bbd632f1154d498061d69b9b76772dc3c # Parent 0c2c67baf33bf6ab4a5207e7ddc429ba476d7589 8017480: Move copying of jfr files to closed makefile Reviewed-by: sla, tbell diff -r 0c2c67baf33b -r 48432b1bbd63 jdk/makefiles/CopyFiles.gmk --- a/jdk/makefiles/CopyFiles.gmk Thu Jun 20 10:17:29 2013 -0700 +++ b/jdk/makefiles/CopyFiles.gmk Tue Jun 25 09:25:16 2013 +0200 @@ -538,21 +538,4 @@ ########################################################################################## -ifndef OPENJDK -ifeq ($(ENABLE_JFR), true) - -JFR_CONFIGURATION_DIR_SRC := $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings/ -JFR_CONFIGURATION_DIR_DST := $(LIBDIR)/jfr/ - -JFR_SRC_FILES = $(wildcard $(JFR_CONFIGURATION_DIR_SRC)/*.jfc) -JFR_TARGET_FILES = $(subst $(JFR_CONFIGURATION_DIR_SRC),$(JFR_CONFIGURATION_DIR_DST),$(JFR_SRC_FILES)) - -$(JFR_CONFIGURATION_DIR_DST)/%.jfc : $(JFR_CONFIGURATION_DIR_SRC)/%.jfc - $(call install-file) - -COPY_FILES += $(JFR_TARGET_FILES) - -endif -endif - -########################################################################################## +-include $(CUSTOM_MAKE_DIR)/CopyFiles.gmk