make/bsd/Makefile

*** 1,7 ****
  #
! # Copyright (c) 1999, 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) 1999, 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.
*** 167,205 ****
  # optimized* - optimized compile, no asserts
  # product*   - the shippable thing:  optimized compile, no asserts, -DPRODUCT
  
  # This target list needs to be coordinated with the usage message
  # in the build.sh script:
! TARGETS           = debug fastdebug optimized product
  
  ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
!   SUBDIR_DOCS     = $(OSNAME)_$(VARIANTARCH)_docs
  else
!   SUBDIR_DOCS     = $(OSNAME)_$(BUILDARCH)_docs
  endif
! SUBDIRS_C1        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))
! SUBDIRS_C2        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
! SUBDIRS_TIERED    = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
! SUBDIRS_CORE      = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
! SUBDIRS_ZERO      = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
! SUBDIRS_SHARK     = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
! SUBDIRS_MINIMAL1  = $(addprefix $(OSNAME)_$(BUILDARCH)_minimal1/,$(TARGETS))
! 
! TARGETS_C2        = $(TARGETS)
! TARGETS_C1        = $(addsuffix 1,$(TARGETS))
! TARGETS_TIERED    = $(addsuffix tiered,$(TARGETS))
! TARGETS_CORE      = $(addsuffix core,$(TARGETS))
! TARGETS_ZERO      = $(addsuffix zero,$(TARGETS))
! TARGETS_SHARK     = $(addsuffix shark,$(TARGETS))
! TARGETS_MINIMAL1  = $(addsuffix minimal1,$(TARGETS))
! 
! BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
! BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) LIBRARY_SUFFIX=$(LIBRARY_SUFFIX)
! BUILDTREE_VARS   += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING)
! BUILDTREE_VARS   += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
  
! BUILDTREE         = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
  
  #-------------------------------------------------------------------------------
  
  # Could make everything by default, but that would take a while.
  all:
--- 167,205 ----
  # optimized* - optimized compile, no asserts
  # product*   - the shippable thing:  optimized compile, no asserts, -DPRODUCT
  
  # This target list needs to be coordinated with the usage message
  # in the build.sh script:
! TARGETS              = debug fastdebug optimized product
  
  ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
!   SUBDIR_DOCS        = $(OSNAME)_$(VARIANTARCH)_docs
  else
!   SUBDIR_DOCS        = $(OSNAME)_$(BUILDARCH)_docs
  endif
! SUBDIRS_C1           = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))
! SUBDIRS_C2           = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
! SUBDIRS_TIERED       = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
! SUBDIRS_CORE         = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
! SUBDIRS_ZERO         = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
! SUBDIRS_SHARK        = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
! SUBDIRS_MINIMAL1     = $(addprefix $(OSNAME)_$(BUILDARCH)_minimal1/,$(TARGETS))
! 
! TARGETS_C2           = $(TARGETS)
! TARGETS_C1           = $(addsuffix 1,$(TARGETS))
! TARGETS_TIERED       = $(addsuffix tiered,$(TARGETS))
! TARGETS_CORE         = $(addsuffix core,$(TARGETS))
! TARGETS_ZERO         = $(addsuffix zero,$(TARGETS))
! TARGETS_SHARK        = $(addsuffix shark,$(TARGETS))
! TARGETS_MINIMAL1     = $(addsuffix minimal1,$(TARGETS))
! 
! BUILDTREE_MAKE       = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
! BUILDTREE_VARS       = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) LIBRARY_SUFFIX=$(LIBRARY_SUFFIX)
! BUILDTREE_VARS      += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING)
! BUILDTREE_VARS      += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE)
  
! BUILDTREE            = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
  
  #-------------------------------------------------------------------------------
  
  # Could make everything by default, but that would take a while.
  all: