--- old/make/windows/makefiles/generated.make 2019-02-15 19:02:09.535809322 +0300 +++ new/make/windows/makefiles/generated.make 2019-02-15 19:02:09.451812265 +0300 @@ -30,9 +30,9 @@ JvmtiOutDir=jvmtifiles !include $(WorkSpace)/make/windows/makefiles/jvmti.make -# Pick up rules for building trace -TraceOutDir=tracefiles -!include $(WorkSpace)/make/windows/makefiles/trace.make +# Pick up rules for building JFR +JfrOutDir=jfrfiles +!include $(WorkSpace)/make/windows/makefiles/jfr.make # Pick up rules for building SA !include $(WorkSpace)/make/windows/makefiles/sa.make @@ -40,9 +40,9 @@ AdlcOutDir=adfiles !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") -default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) buildobjfiles +default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) $(JfrGeneratedFiles) buildobjfiles !else -default:: $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) buildobjfiles +default:: $(JvmtiGeneratedFiles) $(JfrGeneratedFiles) buildobjfiles !endif buildobjfiles: