changeset 18297:48432b1bbd63

8017480: Move copying of jfr files to closed makefile Reviewed-by: sla, tbell
author erikj
date Tue, 25 Jun 2013 09:25:16 +0200
parents 0c2c67baf33b
children e1b3958ae7b1
files jdk/makefiles/CopyFiles.gmk
diffstat 1 files changed, 1 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- 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