*** old/make/linux/Makefile	Tue Apr  9 18:40:30 2013
--- new/make/linux/Makefile	Tue Apr  9 18:40:30 2013

*** 1,7 ****
--- 1,7 ----
  #
! # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 1999, 2013, 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.

*** 140,198 ****
--- 140,185 ----
  #
  #       Target          Tree Type       Build Dir
  #
  #       debug           compiler2       <os>_<arch>_compiler2/debug
  #       fastdebug       compiler2       <os>_<arch>_compiler2/fastdebug
  #       jvmg            compiler2       <os>_<arch>_compiler2/jvmg
  #       optimized       compiler2       <os>_<arch>_compiler2/optimized
  #       profiled        compiler2       <os>_<arch>_compiler2/profiled
  #       product         compiler2       <os>_<arch>_compiler2/product
  #
  #       debug1          compiler1       <os>_<arch>_compiler1/debug
  #       fastdebug1      compiler1       <os>_<arch>_compiler1/fastdebug
  #       jvmg1           compiler1       <os>_<arch>_compiler1/jvmg
  #       optimized1      compiler1       <os>_<arch>_compiler1/optimized
  #       profiled1       compiler1       <os>_<arch>_compiler1/profiled
  #       product1        compiler1       <os>_<arch>_compiler1/product
  #
  #       debugcore       core            <os>_<arch>_core/debug
  #       fastdebugcore   core            <os>_<arch>_core/fastdebug
  #       jvmgcore        core            <os>_<arch>_core/jvmg
  #       optimizedcore   core            <os>_<arch>_core/optimized
  #       profiledcore    core            <os>_<arch>_core/profiled
  #       productcore     core            <os>_<arch>_core/product
  #
  #       debugzero       zero            <os>_<arch>_zero/debug
  #       fastdebugzero   zero            <os>_<arch>_zero/fastdebug
  #       jvmgzero        zero            <os>_<arch>_zero/jvmg
  #       optimizedzero   zero            <os>_<arch>_zero/optimized
  #       profiledzero    zero            <os>_<arch>_zero/profiled
  #       productzero     zero            <os>_<arch>_zero/product
  #
  #       debugshark      shark           <os>_<arch>_shark/debug
  #       fastdebugshark  shark           <os>_<arch>_shark/fastdebug
  #       jvmgshark       shark           <os>_<arch>_shark/jvmg
  #       optimizedshark  shark           <os>_<arch>_shark/optimized
  #       profiledshark   shark           <os>_<arch>_shark/profiled
  #       productshark    shark           <os>_<arch>_shark/product
  #
  #       fastdebugminimal1 minimal1      <os>_<arch>_minimal1/fastdebug
  #       jvmgminimal1      minimal1      <os>_<arch>_minimal1/jvmg
  #       productminimal1   minimal1      <os>_<arch>_minimal1/product
  #
  # What you get with each target:
  #
! # debug*     - "thin" libjvm - debug info linked into the gamma launcher
! # debug*     - debug compile with asserts enabled
  # fastdebug* - optimized compile, but with asserts enabled
  # jvmg*      - "fat" libjvm - debug info linked into libjvm.so
  # optimized* - optimized compile, no asserts
  # profiled*  - gprof
  # 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 jvmg fastdebug optimized profiled product
  
  ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
    SUBDIR_DOCS     = $(OSNAME)_$(VARIANTARCH)_docs
  else
    SUBDIR_DOCS     = $(OSNAME)_$(BUILDARCH)_docs

*** 355,373 ****
--- 342,374 ----
  docs: checks
          $(QUIETLY) mkdir -p $(SUBDIR_DOCS)
          $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs
  
  # Synonyms for win32-like targets.
! compiler2:  jvmg product
! compiler2:  debug product
  
! compiler1:  jvmg1 product1
! compiler1:  debug1 product1
  
! core: jvmgcore productcore
! core: debugcore productcore
  
! zero: jvmgzero productzero
! zero: debugzero productzero
  
! shark: jvmgshark productshark
! shark: debugshark productshark
+ 
+ warn_jvmg_deprecated:
+         echo "Warning: The jvmg target has been replaced with debug"
+         echo "Warning: Please update your usage"
+ 
+ jvmg: warn_jvmg_deprecated debug
+ 
+ jvmg1: warn_jvmg_deprecated debug1
+ 
+ jvmgcore: warn_jvmg_deprecated debugcore
+ 
+ jvmgzero: warn_jvmg_deprecated debugzero
+ 
+ jvmgshark: warn_jvmg_deprecated debugshark
  
  clean_docs:
          rm -rf $(SUBDIR_DOCS)
  
  clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark clean_minimal1: