*** old/make/linux/makefiles/minimal1.make	Thu Jul 25 02:52:09 2013
--- new/make/linux/makefiles/minimal1.make	Thu Jul 25 02:52:07 2013

*** 22,41 ****
--- 22,45 ----
  #
  #
  
  TYPE=MINIMAL1
  
  INCLUDE_JVMTI ?= false
  INCLUDE_FPROF ?= false
  INCLUDE_VM_STRUCTS ?= false
  INCLUDE_JNI_CHECK ?= false
! INCLUDE_SERVICES ?= false
! INCLUDE_MANAGEMENT ?= false
! INCLUDE_ALL_GCS ?= false
! INCLUDE_NMT ?= false
! INCLUDE_TRACE ?= false
! INCLUDE_CDS ?= false
+ # Force all variables to false, overriding any other
+ # setting that may have occurred in the makefiles. These
+ # can still be overridden by passing the variable as an
+ # argument to 'make'
! INCLUDE_JVMTI := false
! INCLUDE_FPROF := false
! INCLUDE_VM_STRUCTS := false
! INCLUDE_JNI_CHECK := false
! INCLUDE_SERVICES := false
! INCLUDE_MANAGEMENT := false
+ INCLUDE_ALL_GCS := false
+ INCLUDE_NMT := false
+ INCLUDE_TRACE := false
+ INCLUDE_CDS := false
  
  CXXFLAGS += -DMINIMAL_JVM -DCOMPILER1 -DVMTYPE=\"Minimal\"
  CFLAGS += -DMINIMAL_JVM -DCOMPILER1 -DVMTYPE=\"Minimal\"
  
  Src_Dirs/MINIMAL1 = $(CORE_PATHS) $(COMPILER1_PATHS)