make/linux/makefiles/buildtree.make

*** 1,7 ****
  #
! # Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
--- 1,7 ----
  #
! # Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
*** 110,124 ****
  endif
  
  # Get things from the platform file.
  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/tracefiles \
          $(PLATFORM_DIR)/generated/extensions
  
  TARGETS      = debug fastdebug optimized product
  SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
  
--- 110,124 ----
  endif
  
  # Get things from the platform file.
  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/tracefiles            \
          $(PLATFORM_DIR)/generated/extensions
  
  TARGETS      = debug fastdebug optimized product
  SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
  
*** 162,172 ****
  BUILDTREE       = \
          $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS)
  
  BUILDTREE_COMMENT       = echo "\# Generated by $(BUILDTREE_MAKE)"
  
! all:  $(SUBMAKE_DIRS)
  
  # Run make in each subdirectory recursively.
  $(SUBMAKE_DIRS): $(SIMPLE_DIRS) FORCE
          $(QUIETLY) [ -d $@ ] || { mkdir -p $@; }
          +$(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F)
--- 162,172 ----
  BUILDTREE       = \
          $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS)
  
  BUILDTREE_COMMENT       = echo "\# Generated by $(BUILDTREE_MAKE)"
  
! all: $(SUBMAKE_DIRS)
  
  # Run make in each subdirectory recursively.
  $(SUBMAKE_DIRS): $(SIMPLE_DIRS) FORCE
          $(QUIETLY) [ -d $@ ] || { mkdir -p $@; }
          +$(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F)