make/windows/makefiles/generated.make

*** 28,50 ****
  
  # Pick up rules for building JVMTI (JSR-163)
  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 SA
  !include $(WorkSpace)/make/windows/makefiles/sa.make
  
  AdlcOutDir=adfiles
  
  !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
! default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) buildobjfiles
  !else
! default:: $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) buildobjfiles
  !endif
  
  buildobjfiles:
          @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) .    > objfiles.make
  
--- 28,50 ----
  
  # Pick up rules for building JVMTI (JSR-163)
  JvmtiOutDir=jvmtifiles
  !include $(WorkSpace)/make/windows/makefiles/jvmti.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
  
  AdlcOutDir=adfiles
  
  !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
! default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) $(JfrGeneratedFiles) buildobjfiles
  !else
! default:: $(JvmtiGeneratedFiles) $(JfrGeneratedFiles) buildobjfiles
  !endif
  
  buildobjfiles:
          @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) .    > objfiles.make