make/linux/makefiles/buildtree.make

*** 120,139 ****
  COMPILER        = $(shell sed -n 's/^compiler[  ]*=[    ]*//p' $(PLATFORM_FILE))
  
  SIMPLE_DIRS     = \
          $(PLATFORM_DIR)/generated/dependencies \
          $(PLATFORM_DIR)/generated/adfiles \
!         $(PLATFORM_DIR)/generated/jvmtifiles \
          $(PLATFORM_DIR)/generated/jfrfiles
  
  TARGETS      = debug fastdebug optimized product
  SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
  
  # For dependencies and recursive makes.
  BUILDTREE_MAKE  = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
  
! BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make jfr.make sa.make
  
  BUILDTREE_VARS  = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
          SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
  
  # Define variables to be set in flags.make.
--- 120,146 ----
  COMPILER        = $(shell sed -n 's/^compiler[  ]*=[    ]*//p' $(PLATFORM_FILE))
  
  SIMPLE_DIRS     = \
          $(PLATFORM_DIR)/generated/dependencies \
          $(PLATFORM_DIR)/generated/adfiles \
!         $(PLATFORM_DIR)/generated/jvmtifiles
! 
! ifeq ($(ENABLE_JFR), true)
! SIMPLE_DIRS     += \
          $(PLATFORM_DIR)/generated/jfrfiles
+ endif
  
  TARGETS      = debug fastdebug optimized product
  SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
  
  # For dependencies and recursive makes.
  BUILDTREE_MAKE  = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
  
! BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make
! ifeq ($(ENABLE_JFR), true)
! BUILDTREE_TARGETS += jfr.make
! endif
  
  BUILDTREE_VARS  = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
          SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
  
  # Define variables to be set in flags.make.