make/bsd/makefiles/buildtree.make

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+# 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.

@@ -50,13 +50,10 @@
 # jvmti.make    - generate JVMTI bindings from the spec (JSR-163)
 #
 # The makefiles are split this way so that "make foo" will run faster by not
 # having to read the dependency files for the vm.
 
-# needs to be set here since this Makefile doesn't include defs.make
-OS_VENDOR:=$(shell uname -s)
-
 -include $(SPEC)
 include $(GAMMADIR)/make/scm.make
 include $(GAMMADIR)/make/defs.make
 include $(GAMMADIR)/make/altsrc.make
 

@@ -112,15 +109,15 @@
 
 # Get things from the platform file.
 COMPILER        = $(shell sed -n 's/^compiler[  ]*=[    ]*//p' $(PLATFORM_FILE))
 
 # dtracefiles is used on BSD versions that implement Dtrace (like MacOS X)
-SIMPLE_DIRS     = \
-        $(PLATFORM_DIR)/generated/dependencies \
-        $(PLATFORM_DIR)/generated/adfiles \
-        $(PLATFORM_DIR)/generated/jvmtifiles \
-        $(PLATFORM_DIR)/generated/tracefiles \
+SIMPLE_DIRS     =                                       \
+        $(PLATFORM_DIR)/generated/dependencies          \
+        $(PLATFORM_DIR)/generated/adfiles               \
+        $(PLATFORM_DIR)/generated/jvmtifiles            \
+        $(PLATFORM_DIR)/generated/tracefiles            \
         $(PLATFORM_DIR)/generated/dtracefiles
 
 TARGETS      = debug fastdebug optimized product
 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
 

@@ -165,11 +162,11 @@
 BUILDTREE       = \
         $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS)
 
 BUILDTREE_COMMENT       = echo "\# Generated by $(BUILDTREE_MAKE)"
 
-all:  $(SUBMAKE_DIRS)
+all: $(SUBMAKE_DIRS)
 
 # Run make in each subdirectory recursively.
 $(SUBMAKE_DIRS): $(SIMPLE_DIRS) FORCE
         $(QUIETLY) [ -d $@ ] || { mkdir -p $@; }
         +$(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F)