--- a/make/hotspot/gensrc/GenerateSources.gmk	Fri Mar 01 12:20:36 2019 +0100
+++ b/make/hotspot/gensrc/GenerateSources.gmk	Fri Mar 01 13:49:52 2019 +0100
@@ -36,10 +36,10 @@
 
 # The real work is done in these files
 
+include gensrc/GensrcJfr.gmk
 include gensrc/GensrcAdlc.gmk
 include gensrc/GensrcDtrace.gmk
 include gensrc/GensrcJvmti.gmk
-include gensrc/GensrcJfr.gmk
 
 $(eval $(call IncludeCustomExtension, hotspot/gensrc/GenerateSources.gmk))
 

--- a/make/hotspot/gensrc/GensrcDtrace.gmk	Fri Mar 01 12:20:36 2019 +0100
+++ b/make/hotspot/gensrc/GensrcDtrace.gmk	Fri Mar 01 13:49:52 2019 +0100
@@ -64,9 +64,9 @@
     include lib/JvmFeatures.gmk
     include lib/JvmFlags.gmk
 
-    # We cannot compile until the JVMTI and JFR gensrc has finished
+    # We cannot compile until the JVMTI and JFR gensrc has finished.
+    # JFR_FILES is defined in GensrcJfr.gmk.
     JVMTI_H := $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles/jvmti.h
-    JFR_FILES := $(JVM_VARIANT_OUTPUTDIR)/gensrc/jfrfiles/jfrEventClasses.hpp
 
     $(eval $(call SetupNativeCompilation, BUILD_DTRACE_GEN_OFFSETS, \
         NAME := dtraceGenOffsets, \

--- a/make/hotspot/gensrc/GensrcJfr.gmk	Fri Mar 01 12:20:36 2019 +0100
+++ b/make/hotspot/gensrc/GensrcJfr.gmk	Fri Mar 01 13:49:52 2019 +0100
@@ -64,4 +64,5 @@
     COMMAND := $(TOOL_JFR_GEN) $(METADATA_XML) $(METADATA_XSD) $(JFR_OUTPUTDIR), \
 ))
 
-TARGETS += $(jfr_gen_TARGET)
+JFR_FILES := $(jfr_gen_TARGET)
+TARGETS += $(JFR_FILES)