changeset 1026:46696858adab

Merge
author kvn
date Thu, 05 Dec 2013 15:12:22 -0800
parents 9baf24c25fa8 6c9cfee19264
children 4f4c924640b8
files NewMakefile.gmk common/autoconf/generated-configure.sh common/autoconf/hotspot-spec.gmk.in common/autoconf/spec.gmk.in common/makefiles/HotspotWrapper.gmk common/makefiles/IdlCompilation.gmk common/makefiles/JavaCompilation.gmk common/makefiles/Jprt.gmk common/makefiles/Main.gmk common/makefiles/MakeBase.gmk common/makefiles/MakeHelpers.gmk common/makefiles/Makefile common/makefiles/NativeCompilation.gmk common/makefiles/RMICompilation.gmk common/makefiles/devkit/Makefile common/makefiles/devkit/Tools.gmk common/makefiles/javadoc/CORE_PKGS.gmk common/makefiles/javadoc/Javadoc.gmk common/makefiles/javadoc/NON_CORE_PKGS.gmk common/makefiles/javadoc/Notes.html common/makefiles/support/ListPathsSafely-post-compress.incl common/makefiles/support/ListPathsSafely-pre-compress.incl common/makefiles/support/ListPathsSafely-uncompress.sed common/makefiles/support/unicode2x.sed make/Defs-internal.gmk make/README.pre-components make/common/JavaCompilation.gmk make/common/NativeCompilation.gmk make/corba-rules.gmk make/deploy-rules.gmk make/hotspot-rules.gmk make/install-rules.gmk make/jaxp-rules.gmk make/jaxws-rules.gmk make/jdk-rules.gmk make/jprt.gmk make/langtools-rules.gmk make/nashorn-rules.gmk make/sanity-rules.gmk make/scripts/fixpath.pl make/scripts/vsvars.sh make/sponsors-rules.gmk
diffstat 67 files changed, 5929 insertions(+), 8982 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Nov 21 12:28:58 2013 -0800
+++ b/.hgtags	Thu Dec 05 15:12:22 2013 -0800
@@ -239,3 +239,5 @@
 763ada2a1d8c5962bc8c3d297e57c562d2e95338 jdk8-b115
 cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116
 a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117
+0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118
+9e90215673be68a3e77a9e444e4232076373734d jdk8-b119
--- a/Makefile	Thu Nov 21 12:28:58 2013 -0800
+++ b/Makefile	Thu Dec 05 15:12:22 2013 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -23,549 +23,112 @@
 # questions.
 #
 
-# If NEWBUILD is defined, use the new build-infra Makefiles and configure.
-#     See NewMakefile.gmk for more information.
+# This must be the first rule
+default:
 
-# If not specified, select what the default build is
-ifndef NEWBUILD
-  NEWBUILD=true
+# Inclusion of this pseudo-target will cause make to execute this file
+# serially, regardless of -j. Recursively called makefiles will not be
+# affected, however. This is required for correct dependency management.
+.NOTPARALLEL:
+
+# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
+# /usr/ccs/bin/make lacks basically every other flow control mechanism.
+TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
+
+# Assume we have GNU make, but check version.
+ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
+  $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
 endif
 
-ifeq ($(NEWBUILD),true)
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+  makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+  makefile_path:=$(lastword $(MAKEFILE_LIST))
+endif
+root_dir:=$(dir $(makefile_path))
 
-  # The new top level Makefile
-  include NewMakefile.gmk
+# ... and then we can include our helper functions
+include $(root_dir)/make/MakeHelpers.gmk
 
-else # Original Makefile logic
+$(eval $(call ParseLogLevel))
+$(eval $(call ParseConfAndSpec))
 
-BUILD_PARENT_DIRECTORY=.
+# Now determine if we have zero, one or several configurations to build.
+ifeq ($(SPEC),)
+  # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
+else
+  ifeq ($(words $(SPEC)),1)
+    # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
+    include $(root_dir)/make/Main.gmk
+  else
+    # We are building multiple configurations.
+    # First, find out the valid targets
+    # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
+    # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
+    all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
+        $(MAKE) -p -q -f make/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
+        grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
 
-# Basename of any originally supplied ALT_OUTPUTDIR directory
-ifndef ORIG_OUTPUTDIR_BASENAME
-  ifdef ALT_OUTPUTDIR
-    ORIG_OUTPUTDIR_BASENAME := $(shell basename $(ALT_OUTPUTDIR))
-  else
-    ORIG_OUTPUTDIR_BASENAME  = $(PLATFORM)-$(ARCH)
-  endif
-endif
-export ORIG_OUTPUTDIR_BASENAME
+    $(all_phony_targets):
+	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
+	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
 
-# The three possible directories created for output (3 build flavors)
-OUTPUTDIR_BASENAME-          = $(ORIG_OUTPUTDIR_BASENAME)
-OUTPUTDIR_BASENAME-debug     = $(ORIG_OUTPUTDIR_BASENAME)-debug
-OUTPUTDIR_BASENAME-fastdebug = $(ORIG_OUTPUTDIR_BASENAME)-fastdebug
+    .PHONY: $(all_phony_targets)
 
-# Relative path to a debug output area
-REL_JDK_OUTPUTDIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))
-
-# The created jdk image directory
-JDK_IMAGE_DIRNAME = j2sdk-image
-JDK_IMAGE_DIR     = $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
-ABS_JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
-
-# Relative path from an output directory to the image directory
-REL_JDK_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))/$(JDK_IMAGE_DIRNAME)
-REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
-REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
-
-ifndef TOPDIR
-  TOPDIR:=.
-endif
-
-ifndef JDK_TOPDIR
-  JDK_TOPDIR=$(TOPDIR)/jdk
-endif
-ifndef JDK_MAKE_SHARED_DIR
-  JDK_MAKE_SHARED_DIR=$(JDK_TOPDIR)/make/common/shared
-endif
-
-default: all
-
-include $(JDK_MAKE_SHARED_DIR)/Defs-control.gmk
-include ./make/Defs-internal.gmk
-include ./make/sanity-rules.gmk
-include ./make/hotspot-rules.gmk
-include ./make/langtools-rules.gmk
-include ./make/corba-rules.gmk
-include ./make/jaxp-rules.gmk
-include ./make/jaxws-rules.gmk
-include ./make/jdk-rules.gmk
-include ./make/nashorn-rules.gmk
-include ./make/install-rules.gmk
-include ./make/sponsors-rules.gmk
-include ./make/deploy-rules.gmk
-
-all:: sanity
-
-ifeq ($(SKIP_FASTDEBUG_BUILD), false)
-  all:: fastdebug_build
-endif
-
-ifeq ($(SKIP_DEBUG_BUILD), false)
-  all:: debug_build
-endif
-
-all:: all_product_build 
-
-all_product_build::
-
-# Everything for a full product build
-ifeq ($(SKIP_PRODUCT_BUILD), false)
-
-  all_product_build:: product_build
-
-  ifeq ($(BUILD_INSTALL), true)
-    all_product_build:: $(INSTALL)
-    clobber:: install-clobber
-  endif
-
-  ifeq ($(BUILD_SPONSORS), true)
-    all_product_build:: $(SPONSORS)
-    clobber:: sponsors-clobber
-  endif
-
-  ifneq ($(SKIP_COMPARE_IMAGES), true)
-    all_product_build:: compare-image
-  endif
-
-endif
-
-define StartTimer
-	$(MKDIR) -p $(BUILDTIMESDIR)
-	$(RM) $(BUILDTIMESDIR)/build_time_*
-	$(call RecordStartTime,TOTAL)
-endef
-
-define StopTimer
-	$(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,TOTAL) && $(call ReportBuildTimes,$1),)
-endef
-
-# Generic build of basic repo series
-generic_build_repo_series:: $(SOURCE_TIPS)
-	$(MKDIR) -p $(JDK_IMAGE_DIR)
-	@$(call StartTimer)
-
-ifeq ($(BUILD_LANGTOOLS), true)
-  generic_build_repo_series:: langtools
-  clobber:: langtools-clobber
-endif
-
-ifeq ($(BUILD_CORBA), true)
-  generic_build_repo_series:: corba
-  clobber:: corba-clobber
-endif
-
-ifeq ($(BUILD_JAXP), true)
-  generic_build_repo_series:: jaxp
-  clobber:: jaxp-clobber
-endif
-
-ifeq ($(BUILD_JAXWS), true)
-  generic_build_repo_series:: jaxws
-  clobber:: jaxws-clobber
-endif
-
-ifeq ($(BUILD_HOTSPOT), true)
-  generic_build_repo_series:: $(HOTSPOT) 
-  clobber:: hotspot-clobber
-endif
-
-ifeq ($(BUILD_JDK), true)
-  generic_build_repo_series:: $(JDK_JAVA_EXE)
-  clobber:: jdk-clobber
-endif
-
-ifeq ($(BUILD_NASHORN), true)
-  generic_build_repo_series:: $(NASHORN)
-  clobber:: nashorn-clobber
-endif
-
-ifeq ($(BUILD_DEPLOY), true)
-  generic_build_repo_series:: $(DEPLOY)
-  clobber:: deploy-clobber
-endif
-
-generic_build_repo_series::
-	@$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build))
-
-# The debug build, fastdebug or debug. Needs special handling.
-#  Note that debug builds do NOT do INSTALL steps, but must be done
-#  after the product build and before the INSTALL step of the product build.
-#
-#   DEBUG_NAME is fastdebug or debug
-#   ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix
-#   The resulting image directory (j2sdk-image) is used by the install makefiles
-#     to create a debug install bundle jdk-*-debug-** bundle (tar or zip) 
-#     which will install in the debug or fastdebug subdirectory of the
-#     normal product install area.
-#     The install process needs to know what the DEBUG_NAME is, so
-#     look for INSTALL_DEBUG_NAME in the install rules.
-#
-#   NOTE: On windows, do not use $(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME).
-#         Due to the use of short paths in $(ABS_OUTPUTDIR), this may 
-#         not be the same location.
-#
-
-# Location of fresh bootdir output
-ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
-FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
-FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR)
-  
-create_fresh_product_bootdir: FRC
-	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
-		GENERATE_DOCS=false \
-		BOOT_CYCLE_SETTINGS= \
-		build_product_image
-
-create_fresh_debug_bootdir: FRC
-	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
-		GENERATE_DOCS=false \
-		BOOT_CYCLE_DEBUG_SETTINGS= \
-		build_debug_image
-
-create_fresh_fastdebug_bootdir: FRC
-	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
-		GENERATE_DOCS=false \
-		BOOT_CYCLE_DEBUG_SETTINGS= \
-		build_fastdebug_image
-
-# Create boot image?
-ifeq ($(SKIP_BOOT_CYCLE),false)
-  ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
-    DO_BOOT_CYCLE=true
   endif
 endif
 
+# Include this after a potential spec file has been included so that the bundles target
+# has access to the spec variables.
+include $(root_dir)/make/Jprt.gmk
 
+# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
+# If you addd more global targets, please update the variable global_targets in MakeHelpers.
 
-ifeq ($(DO_BOOT_CYCLE),true)
-  
-  # Create the bootdir to use in the build
-  product_build:: create_fresh_product_bootdir
-  debug_build:: create_fresh_debug_bootdir
-  fastdebug_build:: create_fresh_fastdebug_bootdir
+help:
+	$(info )
+	$(info OpenJDK Makefile help)
+	$(info =====================)
+	$(info )
+	$(info Common make targets)
+	$(info .  make [default]         # Compile all product in langtools, hotspot, jaxp, jaxws,)
+	$(info .                         # corba and jdk)
+	$(info .  make all               # Compile everything, all repos and images)
+	$(info .  make images            # Create complete j2sdk and j2re images)
+	$(info .  make docs              # Create javadocs)
+	$(info .  make overlay-images    # Create limited images for sparc 64 bit platforms)
+	$(info .  make profiles          # Create complete j2re compact profile images)
+	$(info .  make bootcycle-images  # Build images twice, second time with newly build JDK)
+	$(info .  make install           # Install the generated images locally)
+	$(info .  make clean             # Remove all files generated by make, but not those)
+	$(info .                         # generated by configure)
+	$(info .  make dist-clean        # Remove all files, including configuration)
+	$(info .  make help              # Give some help on using make)
+	$(info .  make test              # Run tests, default is all tests (see TEST below))
+	$(info )
+	$(info Targets for specific components)
+	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
+	$(info .  make <component>       # Build <component> and everything it depends on. )
+	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
+	$(info .                         # is faster but can result in incorrect build results!)
+	$(info .  make clean-<component> # Remove files generated by make for <component>)
+	$(info )
+	$(info Useful make variables)
+	$(info .  make CONF=             # Build all configurations (note, assignment is empty))
+	$(info .  make CONF=<substring>  # Build the configuration(s) with a name matching)
+	$(info .                         # <substring>)
+	$(info )
+	$(info .  make LOG=<loglevel>    # Change the log level from warn to <loglevel>)
+	$(info .                         # Available log levels are:)
+	$(info .                         # 'warn' (default), 'info', 'debug' and 'trace')
+	$(info .                         # To see executed command lines, use LOG=debug)
+	$(info )
+	$(info .  make JOBS=<n>          # Run <n> parallel make jobs)
+	$(info .                         # Note that -jN does not work as expected!)
+	$(info )
+	$(info .  make test TEST=<test>  # Only run the given test or tests, e.g.)
+	$(info .                         # make test TEST="jdk_lang jdk_net")
+	$(info )
 
-  # Define variables to be used now for the boot jdk
-  BOOT_CYCLE_SETTINGS= \
-     ALT_BOOTDIR=$(FRESH_BOOTDIR) \
-     ALT_JDK_IMPORT_PATH=$(FRESH_BOOTDIR)
-  BOOT_CYCLE_DEBUG_SETTINGS= \
-     ALT_BOOTDIR=$(FRESH_DEBUG_BOOTDIR) \
-     ALT_JDK_IMPORT_PATH=$(FRESH_DEBUG_BOOTDIR)
-
-else
-
-  # Use the supplied ALT_BOOTDIR as the boot
-  BOOT_CYCLE_SETTINGS=
-  BOOT_CYCLE_DEBUG_SETTINGS=
-
-endif
-
-build_product_image:
-	$(MAKE) \
-	        SKIP_FASTDEBUG_BUILD=true \
-	        SKIP_DEBUG_BUILD=true \
-	        $(BOOT_CYCLE_SETTINGS) \
-	        generic_build_repo_series
-
-#   NOTE: On windows, do not use $(ABS_OUTPUTDIR)-$(DEBUG_NAME).
-#         Due to the use of short paths in $(ABS_OUTPUTDIR), this may 
-#         not be the same location.
-
-generic_debug_build:
-	$(MAKE) \
-		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
-	        DEBUG_NAME=$(DEBUG_NAME) \
-		GENERATE_DOCS=false \
-	        $(BOOT_CYCLE_DEBUG_SETTINGS) \
-		generic_build_repo_series
-
-build_debug_image:
-	$(MAKE) DEBUG_NAME=debug generic_debug_build
-
-build_fastdebug_image:
-	$(MAKE) DEBUG_NAME=fastdebug generic_debug_build
-
-# Build final image
-product_build:: build_product_image
-debug_build:: build_debug_image
-fastdebug_build:: build_fastdebug_image
-
-# The source tips are stored with the relative path to the repo.
-#   This file will be used when constructing the jdk image.
-source_tips: $(SOURCE_TIPS)
-	$(CAT) $<
-$(SOURCE_TIPS): FRC
-	@$(prep-target)
-	@$(call GetSourceTips)
-
-clobber:: REPORT_BUILD_TIMES=
-clobber:: 
-	$(RM) -r $(OUTPUTDIR)/*
-	-($(RMDIR) -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1; $(TRUE))
-
-clean: clobber
-
-#
-# Dev builds
-#
-
-dev : dev-build
-
-dev-build:
-	$(MAKE) DEV_ONLY=true all
-dev-sanity:
-	$(MAKE) DEV_ONLY=true sanity
-dev-clobber:
-	$(MAKE) DEV_ONLY=true clobber
-
-#
-# Quick jdk verification build
-#
-jdk_only:
-	$(MAKE) SKIP_FASTDEBUG_BUILD=true BUILD_HOTSPOT=false all
-
-
-#
-# Quick jdk verification fastdebug build
-#
-jdk_fastdebug_only:
-	$(MAKE) DEBUG_NAME=fastdebug BUILD_HOTSPOT=false BUILD_DEPLOY=false \
-	    BUILD_INSTALL=false BUILD_SPONSORS=false generic_debug_build
-
-#
-# Quick deploy verification fastdebug build
-#
-deploy_fastdebug_only:
-	$(MAKE) \
-	    DEBUG_NAME=fastdebug \
-	    BUILD_HOTSPOT=false \
-	    BUILD_JDK=false \
-	    BUILD_LANGTOOLS=false \
-	    BUILD_NASHORN=false \
-	    BUILD_CORBA=false \
-	    BUILD_JAXP=false \
-	    BUILD_JAXWS=false \
-	    BUILD_INSTALL=false \
-	    BUILD_SPONSORS=false \
-	    generic_debug_build
-
-#
-# Product build (skip debug builds)
-#
-product_only:
-	$(MAKE) SKIP_FASTDEBUG_BUILD=true all
-
-#
-# Check target
-#
-
-check: variable_check
-
-#
-# Help target
-#
-help: intro_help target_help variable_help notes_help examples_help
-
-# Intro help message
-intro_help:
-	@$(ECHO) "\
-Makefile for the JDK builds (all the JDK). \n\
-"
-
-# Target help
-target_help:
-	@$(ECHO) "\
---- Common Targets ---  \n\
-all               -- build the core JDK (default target) \n\
-help              -- Print out help information \n\
-check             -- Check make variable values for correctness \n\
-sanity            -- Perform detailed sanity checks on system and settings \n\
-fastdebug_build   -- build the core JDK in 'fastdebug' mode (-g -O) \n\
-debug_build       -- build the core JDK in 'debug' mode (-g) \n\
-clean             -- remove all built and imported files \n\
-clobber           -- same as clean \n\
-"
-
-# Variable help (only common ones used by this Makefile)
-variable_help: variable_help_intro variable_list variable_help_end
-variable_help_intro:
-	@$(ECHO) "--- Common Variables ---"
-variable_help_end:
-	@$(ECHO) " "
-
-# One line descriptions for the variables
-OUTPUTDIR.desc             = Output directory
-PARALLEL_COMPILE_JOBS.desc = Solaris/Linux parallel compile run count
-SLASH_JAVA.desc            = Root of all build tools, e.g. /java or J:
-BOOTDIR.desc               = JDK used to boot the build
-JDK_IMPORT_PATH.desc       = JDK used to import components of the build
-COMPILER_PATH.desc         = Compiler install directory
-CACERTS_FILE.desc          = Location of certificates file
-DEVTOOLS_PATH.desc         = Directory containing zip and gnumake
-CUPS_HEADERS_PATH.desc     = Include directory location for CUPS header files
-
-# Make variables to print out (description and value)
-VARIABLE_PRINTVAL_LIST +=       \
-    OUTPUTDIR                   \
-    PARALLEL_COMPILE_JOBS       \
-    SLASH_JAVA                  \
-    BOOTDIR                     \
-    JDK_IMPORT_PATH             \
-    COMPILER_PATH               \
-    CACERTS_FILE                \
-    DEVTOOLS_PATH
-
-# Make variables that should refer to directories that exist
-VARIABLE_CHECKDIR_LIST +=       \
-    SLASH_JAVA                  \
-    BOOTDIR                     \
-    JDK_IMPORT_PATH             \
-    COMPILER_PATH               \
-    DEVTOOLS_PATH 
-
-# Make variables that should refer to files that exist
-VARIABLE_CHECKFIL_LIST +=       \
-    CACERTS_FILE
-
-# For pattern rules below, so all are treated the same
-DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval)
-DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
-DO_CHECKFIL_LIST=$(VARIABLE_CHECKFIL_LIST:%=%.checkfil)
-
-# Complete variable check
-variable_check: $(DO_CHECKDIR_LIST) $(DO_CHECKFIL_LIST)
-variable_list: $(DO_PRINTVAL_LIST) variable_check
-
-# Pattern rule for printing out a variable
-%.printval:
-	@$(ECHO) "  ALT_$* - $($*.desc)"
-	@$(ECHO) "  \t $*=$($*)"
-
-# Pattern rule for checking to see if a variable with a directory exists
-%.checkdir:
-	@if [ ! -d $($*) ] ; then \
-	    $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \
-	fi
-
-# Pattern rule for checking to see if a variable with a file exists
-%.checkfil:
-	@if [ ! -f $($*) ] ; then \
-	    $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \
-	fi
-
-# Misc notes on help
-notes_help:
-	@$(ECHO) "\
---- Notes --- \n\
-- All builds use same output directory unless overridden with \n\
- \t ALT_OUTPUTDIR=<dir>, changing from product to fastdebug you may want \n\
- \t to use the clean target first. \n\
-- JDK_IMPORT_PATH must refer to a compatible build, not all past promoted \n\
- \t builds or previous release JDK builds will work. \n\
-- The fastest builds have been when the sources and the BOOTDIR are on \n\
- \t local disk. \n\
-"
-
-examples_help:
-	@$(ECHO) "\
---- Examples --- \n\
-  $(MAKE) fastdebug_build \n\
-  $(MAKE) ALT_OUTPUTDIR=/tmp/foobar all \n\
-  $(MAKE) ALT_OUTPUTDIR=/tmp/foobar fastdebug_build \n\
-  $(MAKE) ALT_OUTPUTDIR=/tmp/foobar all \n\
-  $(MAKE) ALT_BOOTDIR=/opt/java/jdk1.5.0 \n\
-  $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk1.6.0 \n\
-"
-
-################################################################
-# Source bundling
-################################################################
-ifeq ($(BUNDLE_RULES_AVAILABLE), true)
-  include $(BUNDLE_RULES)
-endif
-
-################################################################
-# rule to test
-################################################################
-
-.NOTPARALLEL: test_run
-
-test:
-	$(MAKE) test_run
-
-test_run: test_clean test_start test_summary
-
-test_start:
-	@$(ECHO) "Tests started at `$(DATE)`"
-
-test_clean:
-	$(RM) $(OUTPUTDIR)/test_failures.txt $(OUTPUTDIR)/test_log.txt
-
-test_summary: $(OUTPUTDIR)/test_failures.txt
-	@$(ECHO) "#################################################"
-	@$(ECHO) "Tests completed at `$(DATE)`"
-	@( $(EGREP) '^TEST STATS:' $(OUTPUTDIR)/test_log.txt \
-          || $(ECHO) "No TEST STATS seen in log" )
-	@$(ECHO) "For complete details see: $(OUTPUTDIR)/test_log.txt"
-	@$(ECHO) "#################################################"
-	@if [ -s $< ] ; then                                           \
-          $(ECHO) "ERROR: Test failure count: `$(CAT) $< | $(WC) -l`"; \
-          $(CAT) $<;                                                   \
-          exit 1;                                                      \
-        else                                                           \
-          $(ECHO) "Success! No failures detected";                     \
-        fi
-
-# Get failure list from log
-$(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
-	@$(RM) $@
-	@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
-
-# Get log file of all tests run
-JDK_TO_TEST := $(shell 							\
-  if [ -d "$(ABS_JDK_IMAGE_DIR)" ] ; then 				\
-    $(ECHO) "$(ABS_JDK_IMAGE_DIR)"; 					\
-  elif [ -d "$(ABS_OUTPUTDIR)/bin" ] ; then 				\
-    $(ECHO) "$(ABS_OUTPUTDIR)"; 					\
-  elif [ "$(PRODUCT_HOME)" != "" -a -d "$(PRODUCT_HOME)/bin" ] ; then 	\
-    $(ECHO) "$(PRODUCT_HOME)"; 						\
-  fi 									\
-)
-TEST_TARGETS=all
-$(OUTPUTDIR)/test_log.txt:
-	$(RM) $@
-	( $(CD) test &&                                                     \
-          $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) $(TEST_TARGETS) \
-        ) | tee $@
-
-################################################################
-# JPRT rule to build
-################################################################
-
-include ./make/jprt.gmk
-
-################################################################
-#  PHONY
-################################################################
-
-.PHONY: all  test test_run test_start test_summary test_clean \
-	generic_build_repo_series \
-	what clobber insane \
-        dev dev-build dev-sanity dev-clobber \
-        product_build \
-        fastdebug_build \
-        debug_build  \
-        build_product_image  \
-        build_debug_image  \
-        build_fastdebug_image \
-        create_fresh_product_bootdir \
-        create_fresh_debug_bootdir \
-        create_fresh_fastdebug_bootdir \
-        generic_debug_build
-
-# Force target
-FRC:
-
-endif # Original Makefile logic
-
+.PHONY: help
--- a/NewMakefile.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-#
-# Copyright (c) 2012, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This must be the first rule
-default:
-
-# Inclusion of this pseudo-target will cause make to execute this file
-# serially, regardless of -j. Recursively called makefiles will not be
-# affected, however. This is required for correct dependency management.
-.NOTPARALLEL:
-
-# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
-# /usr/ccs/bin/make lacks basically every other flow control mechanism.
-TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
-
-# Assume we have GNU make, but check version.
-ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
-  $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
-endif
-
-# Locate this Makefile
-ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
-  makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
-  makefile_path:=$(lastword $(MAKEFILE_LIST))
-endif
-root_dir:=$(dir $(makefile_path))
-
-# ... and then we can include our helper functions
-include $(root_dir)/common/makefiles/MakeHelpers.gmk
-
-$(eval $(call ParseLogLevel))
-$(eval $(call ParseConfAndSpec))
-
-# Now determine if we have zero, one or several configurations to build.
-ifeq ($(SPEC),)
-  # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
-else
-  ifeq ($(words $(SPEC)),1)
-    # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
-    include $(root_dir)/common/makefiles/Main.gmk
-  else
-    # We are building multiple configurations.
-    # First, find out the valid targets
-    # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
-    # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
-    all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
-        $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
-        grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
-
-    $(all_phony_targets):
-	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
-	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
-
-    .PHONY: $(all_phony_targets)
-
-  endif
-endif
-
-# Include this after a potential spec file has been included so that the bundles target
-# has access to the spec variables.
-include $(root_dir)/common/makefiles/Jprt.gmk
-
-# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
-# If you addd more global targets, please update the variable global_targets in MakeHelpers.
-
-help:
-	$(info )
-	$(info OpenJDK Makefile help)
-	$(info =====================)
-	$(info )
-	$(info Common make targets)
-	$(info .  make [default]         # Compile all product in langtools, hotspot, jaxp, jaxws,)
-	$(info .                         # corba and jdk)
-	$(info .  make all               # Compile everything, all repos and images)
-	$(info .  make images            # Create complete j2sdk and j2re images)
-	$(info .  make docs              # Create javadocs)
-	$(info .  make overlay-images    # Create limited images for sparc 64 bit platforms)
-	$(info .  make profiles          # Create complete j2re compact profile images)
-	$(info .  make bootcycle-images  # Build images twice, second time with newly build JDK)
-	$(info .  make install           # Install the generated images locally)
-	$(info .  make clean             # Remove all files generated by make, but not those)
-	$(info .                         # generated by configure)
-	$(info .  make dist-clean        # Remove all files, including configuration)
-	$(info .  make help              # Give some help on using make)
-	$(info .  make test              # Run tests, default is all tests (see TEST below))
-	$(info )
-	$(info Targets for specific components)
-	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
-	$(info .  make <component>       # Build <component> and everything it depends on. )
-	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
-	$(info .                         # is faster but can result in incorrect build results!)
-	$(info .  make clean-<component> # Remove files generated by make for <component>)
-	$(info )
-	$(info Useful make variables)
-	$(info .  make CONF=             # Build all configurations (note, assignment is empty))
-	$(info .  make CONF=<substring>  # Build the configuration(s) with a name matching)
-	$(info .                         # <substring>)
-	$(info )
-	$(info .  make LOG=<loglevel>    # Change the log level from warn to <loglevel>)
-	$(info .                         # Available log levels are:)
-	$(info .                         # 'warn' (default), 'info', 'debug' and 'trace')
-	$(info .                         # To see executed command lines, use LOG=debug)
-	$(info )
-	$(info .  make JOBS=<n>          # Run <n> parallel make jobs)
-	$(info .                         # Note that -jN does not work as expected!)
-	$(info )
-	$(info .  make test TEST=<test>  # Only run the given test or tests, e.g.)
-	$(info .                         # make test TEST="jdk_lang jdk_net")
-	$(info )
-
-.PHONY: help
--- a/common/autoconf/Makefile.in	Thu Nov 21 12:28:58 2013 -0800
+++ b/common/autoconf/Makefile.in	Thu Dec 05 15:12:22 2013 -0800
@@ -24,4 +24,4 @@
 # This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
 # GENERATED FILE, DO NOT EDIT
 SPEC:=@OUTPUT_ROOT@/spec.gmk
-include @SRC_ROOT@/NewMakefile.gmk
+include @SRC_ROOT@/Makefile
--- a/common/autoconf/basics.m4	Thu Nov 21 12:28:58 2013 -0800
+++ b/common/autoconf/basics.m4	Thu Dec 05 15:12:22 2013 -0800
@@ -412,7 +412,7 @@
   # Test from where we are running configure, in or outside of src root.
   if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
       || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
-      || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
+      || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
     if test "x${CONF_NAME}" = x; then
--- a/common/autoconf/generated-configure.sh	Thu Nov 21 12:28:58 2013 -0800
+++ b/common/autoconf/generated-configure.sh	Thu Dec 05 15:12:22 2013 -0800
@@ -3868,7 +3868,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1383701615
+DATE_WHEN_GENERATED=1386285126
 
 ###############################################################################
 #
@@ -8096,7 +8096,7 @@
   # Test from where we are running configure, in or outside of src root.
   if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
       || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
-      || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
+      || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
     if test "x${CONF_NAME}" = x; then
@@ -16253,32 +16253,25 @@
     cd "$CURDIR"
     # Verify that the addon source root does not have any root makefiles.
     # If it does, then it is usually an error, prevent this.
-    if test -f $with_add_source_root/langtools/makefiles/Makefile || \
-      test -f $with_add_source_root/langtools/make/Makefile; then
+    if test -f $with_add_source_root/langtools/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/corba/makefiles/Makefile || \
-      test -f $with_add_source_root/corba/make/Makefile; then
+    if test -f $with_add_source_root/corba/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full corba repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
-      test -f $with_add_source_root/jaxp/make/Makefile; then
+    if test -f $with_add_source_root/jaxp/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
-      test -f $with_add_source_root/jaxws/make/Makefile; then
+    if test -f $with_add_source_root/jaxws/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
-      test -f $with_add_source_root/hotspot/make/Makefile; then
+    if test -f $with_add_source_root/hotspot/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
-      test -f $with_add_source_root/nashorn/make/Makefile; then
+    if test -f $with_add_source_root/nashorn/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/jdk/makefiles/Makefile || \
-      test -f $with_add_source_root/jdk/make/Makefile; then
+    if test -f $with_add_source_root/jdk/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
   fi
@@ -16292,32 +16285,25 @@
     cd "$with_override_source_root"
     OVERRIDE_SRC_ROOT="`pwd`"
     cd "$CURDIR"
-    if test -f $with_override_source_root/langtools/makefiles/Makefile || \
-      test -f $with_override_source_root/langtools/make/Makefile; then
+    if test -f $with_override_source_root/langtools/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/corba/makefiles/Makefile || \
-      test -f $with_override_source_root/corba/make/Makefile; then
+    if test -f $with_override_source_root/corba/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full corba repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
-      test -f $with_override_source_root/jaxp/make/Makefile; then
+    if test -f $with_override_source_root/jaxp/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
-      test -f $with_override_source_root/jaxws/make/Makefile; then
+    if test -f $with_override_source_root/jaxws/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
-      test -f $with_override_source_root/hotspot/make/Makefile; then
+    if test -f $with_override_source_root/hotspot/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
-      test -f $with_override_source_root/nashorn/make/Makefile; then
+    if test -f $with_override_source_root/nashorn/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/jdk/makefiles/Makefile || \
-      test -f $with_override_source_root/jdk/make/Makefile; then
+    if test -f $with_override_source_root/jdk/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
   fi
@@ -16396,7 +16382,7 @@
     cd "$with_override_langtools"
     LANGTOOLS_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
+    if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5
@@ -16409,7 +16395,7 @@
     cd "$with_override_corba"
     CORBA_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
+    if ! test -f $CORBA_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5
@@ -16422,7 +16408,7 @@
     cd "$with_override_jaxp"
     JAXP_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JAXP_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5
@@ -16435,7 +16421,7 @@
     cd "$with_override_jaxws"
     JAXWS_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JAXWS_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5
@@ -16448,8 +16434,7 @@
     cd "$with_override_hotspot"
     HOTSPOT_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
-        ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
+    if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override hotspot with a full hotspot repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5
@@ -16462,7 +16447,7 @@
     cd "$with_override_nashorn"
     NASHORN_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
+    if ! test -f $NASHORN_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
@@ -16475,7 +16460,7 @@
     cd "$with_override_jdk"
     JDK_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JDK_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override JDK with a full JDK repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if JDK should be overridden" >&5
--- a/common/autoconf/hotspot-spec.gmk.in	Thu Nov 21 12:28:58 2013 -0800
+++ b/common/autoconf/hotspot-spec.gmk.in	Thu Dec 05 15:12:22 2013 -0800
@@ -134,4 +134,4 @@
 
 # Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files.
 # This is needed to get the LOG setting to work properly.
-include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
+include $(SRC_ROOT)/make/common/MakeBase.gmk
--- a/common/autoconf/source-dirs.m4	Thu Nov 21 12:28:58 2013 -0800
+++ b/common/autoconf/source-dirs.m4	Thu Dec 05 15:12:22 2013 -0800
@@ -80,32 +80,25 @@
     cd "$CURDIR"
     # Verify that the addon source root does not have any root makefiles.
     # If it does, then it is usually an error, prevent this.
-    if test -f $with_add_source_root/langtools/makefiles/Makefile || \
-      test -f $with_add_source_root/langtools/make/Makefile; then
+    if test -f $with_add_source_root/langtools/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/corba/makefiles/Makefile || \
-      test -f $with_add_source_root/corba/make/Makefile; then
+    if test -f $with_add_source_root/corba/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
-      test -f $with_add_source_root/jaxp/make/Makefile; then
+    if test -f $with_add_source_root/jaxp/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
-      test -f $with_add_source_root/jaxws/make/Makefile; then
+    if test -f $with_add_source_root/jaxws/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
-      test -f $with_add_source_root/hotspot/make/Makefile; then
+    if test -f $with_add_source_root/hotspot/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
-      test -f $with_add_source_root/nashorn/make/Makefile; then
+    if test -f $with_add_source_root/nashorn/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/jdk/makefiles/Makefile || \
-      test -f $with_add_source_root/jdk/make/Makefile; then
+    if test -f $with_add_source_root/jdk/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.])
     fi
   fi
@@ -119,32 +112,25 @@
     cd "$with_override_source_root"
     OVERRIDE_SRC_ROOT="`pwd`"
     cd "$CURDIR"
-    if test -f $with_override_source_root/langtools/makefiles/Makefile || \
-      test -f $with_override_source_root/langtools/make/Makefile; then
+    if test -f $with_override_source_root/langtools/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/corba/makefiles/Makefile || \
-      test -f $with_override_source_root/corba/make/Makefile; then
+    if test -f $with_override_source_root/corba/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
-      test -f $with_override_source_root/jaxp/make/Makefile; then
+    if test -f $with_override_source_root/jaxp/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
-      test -f $with_override_source_root/jaxws/make/Makefile; then
+    if test -f $with_override_source_root/jaxws/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
-      test -f $with_override_source_root/hotspot/make/Makefile; then
+    if test -f $with_override_source_root/hotspot/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
-      test -f $with_override_source_root/nashorn/make/Makefile; then
+    if test -f $with_override_source_root/nashorn/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/jdk/makefiles/Makefile || \
-      test -f $with_override_source_root/jdk/make/Makefile; then
+    if test -f $with_override_source_root/jdk/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.])
     fi
   fi
@@ -195,7 +181,7 @@
     cd "$with_override_langtools"
     LANGTOOLS_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
+    if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override langtools with a full langtools repo!])
     fi
     AC_MSG_CHECKING([if langtools should be overridden])
@@ -206,7 +192,7 @@
     cd "$with_override_corba"
     CORBA_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
+    if ! test -f $CORBA_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override corba with a full corba repo!])
     fi
     AC_MSG_CHECKING([if corba should be overridden])
@@ -217,7 +203,7 @@
     cd "$with_override_jaxp"
     JAXP_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JAXP_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!])
     fi
     AC_MSG_CHECKING([if jaxp should be overridden])
@@ -228,7 +214,7 @@
     cd "$with_override_jaxws"
     JAXWS_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JAXWS_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!])
     fi
     AC_MSG_CHECKING([if jaxws should be overridden])
@@ -239,8 +225,7 @@
     cd "$with_override_hotspot"
     HOTSPOT_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
-        ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
+    if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!])
     fi
     AC_MSG_CHECKING([if hotspot should be overridden])
@@ -251,7 +236,7 @@
     cd "$with_override_nashorn"
     NASHORN_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
+    if ! test -f $NASHORN_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
     fi
     AC_MSG_CHECKING([if nashorn should be overridden])
@@ -262,7 +247,7 @@
     cd "$with_override_jdk"
     JDK_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JDK_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override JDK with a full JDK repo!])
     fi
     AC_MSG_CHECKING([if JDK should be overridden])
--- a/common/autoconf/spec.gmk.in	Thu Nov 21 12:28:58 2013 -0800
+++ b/common/autoconf/spec.gmk.in	Thu Dec 05 15:12:22 2013 -0800
@@ -65,8 +65,8 @@
 endif
 
 # Specify where the common include directory for makefiles is.
-ifeq (,$(findstring -I @SRC_ROOT@/common/makefiles,$(MAKE)))
-  MAKE:=$(MAKE) -I @SRC_ROOT@/common/makefiles
+ifeq (,$(findstring -I @SRC_ROOT@/make/common,$(MAKE)))
+  MAKE:=$(MAKE) -I @SRC_ROOT@/make/common
 endif
 
 # The "human readable" name of this configuration
--- a/common/bin/compare.sh	Thu Nov 21 12:28:58 2013 -0800
+++ b/common/bin/compare.sh	Thu Dec 05 15:12:22 2013 -0800
@@ -1113,14 +1113,15 @@
 if [ -d "$THIS/install/j2sdk-image" ]; then
     THIS_J2SDK="$THIS/install/j2sdk-image"
     THIS_J2RE="$THIS/install/j2re-image"
-    echo "Comparing install images"
+    echo "Selecting install images in this build"
 elif [ -d "$THIS/deploy/j2sdk-image" ]; then
     THIS_J2SDK="$THIS/deploy/j2sdk-image"
     THIS_J2RE="$THIS/deploy/j2re-image"
-    echo "Comparing deploy images"
+    echo "Selecting deploy images in this build"
 elif [ -d "$THIS/images/j2sdk-image" ]; then
     THIS_J2SDK="$THIS/images/j2sdk-image"
     THIS_J2RE="$THIS/images/j2re-image"
+    echo "Selecting jdk images in this build"
 fi
 
 if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
@@ -1128,15 +1129,18 @@
         # If there is an install image, prefer that, it's also overlay
         THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
         THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
+        echo "Selecting install overlay images in this build"
     else
         THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
         THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
+        echo "Selecting jdk overlay images in this build"
     fi
 fi
 
 if [ -d "$THIS/images/j2sdk-bundle" ]; then
     THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
     THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
+    echo "Selecting bundles in this build"
 fi
 
 # Figure out the layout of the other build (old or new, normal or overlay image)
@@ -1144,21 +1148,34 @@
     if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
         OTHER_J2SDK="$OTHER/j2sdk-image"
         OTHER_J2RE="$OTHER/j2re-image"
+        echo "Selecting old-style images in other build"
     else
         OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
         OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
+        echo "Selecting overlay images in other build"
     fi
+elif [ -d "$OTHER/install/j2sdk-image" ]; then
+    OTHER_J2SDK="$OTHER/install/j2sdk-image"
+    OTHER_J2RE="$OTHER/install/j2re-image"
+    echo "Selecting install images in other build"
+elif [ -d "$OTHER/deploy/j2sdk-image" ]; then
+    OTHER_J2SDK="$OTHER/deploy/j2sdk-image"
+    OTHER_J2RE="$OTHER/deploy/j2re-image"
+    echo "Selecting deploy images in other build"
 elif [ -d "$OTHER/images/j2sdk-image" ]; then
     OTHER_J2SDK="$OTHER/images/j2sdk-image"
     OTHER_J2RE="$OTHER/images/j2re-image"
+    echo "Selecting jdk images in other build"
 fi
 
 if [ -d "$OTHER/j2sdk-bundle" ]; then
     OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
     OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
+    echo "Selecting bundles in other build"
 elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
     OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
     OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
+    echo "Selecting jdk bundles in other build"
 fi
 
 if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
--- a/common/makefiles/HotspotWrapper.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Include the legacy hotspot-spec.gmk (which in turns includes spec.gmk)
-BASE_SPEC:=$(SPEC)
-include $(dir $(SPEC))hotspot-spec.gmk
-include MakeBase.gmk
-
-# Inclusion of this pseudo-target will cause make to execute this file
-# serially, regardless of -j. Recursively called makefiles will not be
-# affected, however. This is required for correct dependency management.
-.NOTPARALLEL:
-
-default: all
-
-# Get all files except .hg in the hotspot directory.
-HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -prune -o -print)
-
-# The old build creates hotspot output dir before calling hotspot and
-# not doing it breaks builds on msys.
-$(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp: $(HOTSPOT_FILES)
-	@$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
-	@($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -j1 $(HOTSPOT_MAKE_ARGS) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC))
-	$(TOUCH) $@
-
-hotspot: $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp
-
-all: hotspot
-
-.PHONY: default all hotspot
--- a/common/makefiles/IdlCompilation.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-PREFIXES=-pkgPrefix CORBA org.omg \
-    -pkgPrefix CosNaming org.omg \
-    -pkgPrefix CosTransactions org.omg \
-    -pkgPrefix CosTSInteroperation org.omg \
-    -pkgPrefix DynamicAny org.omg \
-    -pkgPrefix Dynamic org.omg \
-    -pkgPrefix IOP org.omg \
-    -pkgPrefix Messaging org.omg \
-    -pkgPrefix PortableInterceptor org.omg \
-    -pkgPrefix PortableServer org.omg \
-    -pkgPrefix activation com.sun.corba.se.spi \
-    -pkgPrefix GIOP com.sun.corba.se \
-    -pkgPrefix PortableActivationIDL com.sun.corba.se \
-    -pkgPrefix messages com.sun.corba.se
-
-define add_idl_package
-  # param 1 = MYPACKAGE
-  # param 2 = src root
-  # param 3 = gensrc root
-  # param 4 = source idl to compile
-  # param 5 = target idl package
-  # param 6 = delete these files that were output from the idlj
-  # param 7 = idls that match these patterns should be compiled with -oldImplBase
-  # param 8 = the idlj command
-  # Save the generated java files to a temporary directory so
-  # that we can find them and create proper dependencies.
-  # After that, we move them to the real gensrc target dir.
-  $4_TMPDIR:=tmp___$(subst /,_,$(patsubst $2/%,%,$4))___
-  ifneq ($$(filter $7,$4),)
-    $4_OLDIMPLBASE:=-oldImplBase
-    $4_OLDIMPLBASE_MSG:=with -oldImplBase
-  endif
-  $5 : $4
-	$(MKDIR) -p $3/$$($4_TMPDIR)
-	$(RM) -rf $3/$$($4_TMPDIR)
-	$(MKDIR) -p $(dir $5)
-	$(ECHO) $(LOG_INFO) Compiling IDL $(patsubst $2/%,%,$4)
-	$8 -td $3/$$($4_TMPDIR) \
-	    -i $2/org/omg/CORBA \
-	    -i $2/org/omg/PortableInterceptor \
-	    -i $2/org/omg/PortableServer \
-	    -D CORBA3 -corba 3.0 \
-	    -fall \
-	    $$($4_OLDIMPLBASE) \
-	    $(PREFIXES) \
-	    $4
-	$(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6)
-	$(CP) -r $3/$$($4_TMPDIR)/* $3
-	($(CD) $3/$$($4_TMPDIR) && $(FIND) . -type f | $(SED) 's!\./!$3/!g' | $(NAWK) '{ print $$$$1 ": $4" }' > $5)
-	$(RM) -rf $3/$$($4_TMPDIR)
-endef
-
-define SetupIdlCompilation
-  # param 1 is for example BUILD_IDLS
-  # param 2,3,4,5,6,7,8 are named args.
-  #   IDLJ,SRC,BIN,INCLUDES,EXCLUDES,OLDIMPLBASES,DELETES
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupIdlCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk))
-
-  # Find all existing java files and existing class files.
-  $$(eval $$(call MakeDir,$$($1_BIN)))
-  $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl")
-  $1_BINS := $$(shell find $$($1_BIN) -name "*.java")
-  # Prepend the source/bin path to the filter expressions.
-  $1_SRC_INCLUDES := $$(addprefix $$($1_SRC)/,$$($1_INCLUDES))
-  $1_SRC_EXCLUDES := $$(addprefix $$($1_SRC)/,$$($1_EXCLUDES))
-  $1_BIN_INCLUDES := $$(addprefix $$($1_BIN)/,$$($1_INCLUDES))
-  $1_BIN_EXCLUDES := $$(addprefix $$($1_BIN)/,$$($1_EXCLUDES))
-  $1_OLDIMPLBASES := $$(addprefix $$($1_SRC)/,$$($1_OLDIMPLBASES))
-  # Now remove unwanted java/class files.
-  $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
-  $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
-  $1_BINS := $$(filter $$($1_BIN_INCLUDES),$$($1_BINS))
-  $1_BINS := $$(filter-out $$($1_BIN_EXCLUDES),$$($1_BINS))
-  $1 := $$(sort $$(patsubst $$($1_SRC)/%.idl,$$($1_BIN)/%.idl.d,$$($1_SRCS)))
-  # Now create the dependencies for each idl target.
-  $$(foreach p,$$($1),$$(eval $$(call add_idl_package,$1,$$($1_SRC),$$($1_BIN),$$(patsubst $$($1_BIN)/%.idl.d,$$($1_SRC)/%.idl,$$p),$$p,$$($1_DELETES),$$($1_OLDIMPLBASES),$$($1_IDLJ))))
-endef
-
-.SUFFIXES: .java .class .package
--- a/common/makefiles/JavaCompilation.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,594 +0,0 @@
-#
-# Copyright (c) 2011, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This makefile is much simpler now that it can use the smart javac wrapper
-# for dependency tracking between java packages and incremental compiles.
-# It could be even more simple if we added support for incremental jar updates
-# directly from the smart javac wrapper.
-
-# Cleaning/copying properties here is not a good solution. The properties
-# should be cleaned/copied by a annotation processor in sjavac.
-
-# When you read this source. Remember that $(sort ...) has the side effect
-# of removing duplicates. It is actually this side effect that is
-# desired whenever sort is used below!
-
-ifeq (,$(_MAKEBASE_GMK))
-  $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
-endif
-
-FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
-
-define SetupJavaCompiler
-  # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE
-  # This is the name of the compiler setup.
-  # param 2-9 are named args.
-  #   JVM:=The jvm used to run the javac/javah command
-  #   JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
-  #   FLAGS:=Flags to be supplied to javac
-  #   SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
-  #   SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupJavaCompiler($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompiler, please update JavaCompilation.gmk))
-
-  # The port file contains the tcp/ip on which the server listens
-  # and the cookie necessary to talk to the server.
-  $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
-  # You can use a different JVM to run the background javac server.
-  ifeq ($$($1_SERVER_JVM),)
-    # It defaults to the same JVM that is used to start the javac command.
-    $1_SERVER_JVM:=$$($1_JVM)
-  endif
-endef
-
-define SetupArchive
-  # param 1 is for example ARCHIVE_MYPACKAGE
-  # param 2 are the dependecies
-  # param 3,4,5,6,7,8,9 are named args.
-  #   SRCS:=List of directories in where to find files to add to archive
-  #   SUFFIXES:=File suffixes to include in jar
-  #   INCLUDES:=List of directories/packages in SRCS that should be included
-  #   EXCLUDES:=List of directories/packages in SRCS that should be excluded
-  #   EXCLUDE_FILES:=List of files in SRCS that should be excluded
-  #   EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match.
-  #   JAR:=Jar file to create
-  #   MANIFEST:=Optional manifest file template.
-  #   JARMAIN:=Optional main class to add to manifest
-  #   JARINDEX:=true means generate the index in the jar file.
-  #   SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically
-  #       added to the archive.
-  #   EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
-  #   CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
-
-  # NOTE: $2 is dependencies, not a named argument!
-  $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(findstring $(LOG_LEVEL),trace), $(info *[2] <dependencies> = $(strip $2)))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
-
-  $1_JARMAIN:=$(strip $$($1_JARMAIN))
-  $1_JARNAME:=$$(notdir $$($1_JAR))
-  $1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest
-  $1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess
-  $1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes
-  $1_BIN:=$$(dir $$($1_JAR))
-
-  ifeq (,$$($1_SUFFIXES))
-    # No suffix was set, default to classes.
-    $1_SUFFIXES:=.class
-  endif
-  # Convert suffixes to a find expression
-  $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
-  # On windows, a lot of includes/excludes risk making the command line too long, so
-  # writing the grep patterns to files.
-  ifneq (,$$($1_INCLUDES))
-    $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS), \
-        $$(addprefix $$(src)/,$$($1_INCLUDES)))
-    # If there are a lot of include patterns, output to file to shorten command lines
-    ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
-      $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
-    else
-      $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \
-          $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \
-          >> $$($1_BIN)/_the.$$($1_JARNAME)_include)
-      $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
-    endif
-  endif
-  ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
-    $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
-        $$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
-    # If there are a lot of include patterns, output to file to shorten command lines
-    ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
-      $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
-    else
-      $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \
-          $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \
-          >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
-      $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
-    endif
-  endif
-
-  # Check if this jar needs to have its index generated.
-  ifneq (,$$($1_JARINDEX))
-    $1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@))
-  else
-    $1_JARINDEX = true
-  endif
-  # When this macro is run in the same makefile as the java compilation, dependencies are
-  # transfered in make variables. When the macro is run in a different makefile than the
-  # java compilation, the dependencies need to be found in the filesystem.
-  ifneq (,$2)
-    $1_DEPS:=$2
-  else
-    $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \
-        $$(call CacheFind,$$($1_SRCS)))
-    ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
-      $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
-    endif
-    ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
-      $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
-    endif
-    # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
-    # lines, but not here for use in make dependencies.
-    $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
-    ifeq (,$$($1_SKIP_METAINF))
-      $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
-    endif
-  endif
-
-  # Utility macros, to make the shell script receipt somewhat easier to decipher.
-
-  # The capture contents macro finds all files (matching the patterns, typically
-  # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
-  # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
-  $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      ( ( $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
-          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
-      $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES) ) ) > \
-      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
-  # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
-  ifeq (,$$($1_SKIP_METAINF))
-    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
-  endif
-  # The capture deletes macro finds all deleted files and concatenates them. The resulting file
-  # tells us what to remove from the jar-file.
-  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
-  # The update contents macro updates the jar file with the previously capture contents.
-  # Use 'wc -w' to see if the contents file is empty.
-  $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (cd $$(src) && \
-       if [ "`$(WC) -w _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
-         $(ECHO) "  updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
-         $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
-       fi) $$(NEWLINE))
-  # The s-variants of the above macros are used when the jar is created from scratch.
-  # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
-  $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      ( ( $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
-          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
-      $$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES) ) ) > \
-      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
-
-  ifeq (,$$($1_SKIP_METAINF))
-    $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
-        ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
-        $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
-  endif
-  $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
-
-  # Use a slightly shorter name for logging, but with enough path to identify this jar.
-  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
-
-  ifneq (,$$($1_CHECK_COMPRESS_JAR))
-    $1_JAR_CREATE_OPTIONS := c0fm
-    $1_JAR_UPDATE_OPTIONS := u0f
-    ifeq ($(COMPRESS_JARS), true)
-      $1_JAR_CREATE_OPTIONS := cfm
-      $1_JAR_UPDATE_OPTIONS := uf
-    endif
-  else
-    $1_JAR_CREATE_OPTIONS := cfm
-    $1_JAR_UPDATE_OPTIONS := uf
-  endif
-
-  # Here is the rule that creates/updates the jar file.
-  $$($1_JAR) : $$($1_DEPS)
-	$(MKDIR) -p $$($1_BIN)
-	$$($1_GREP_INCLUDE_OUTPUT)
-	$$($1_GREP_EXCLUDE_OUTPUT)
-	$$(if $$($1_MANIFEST), \
-	  $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
-	      -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
-	, \
-	  $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
-	$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
-	$$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE))
-	$$(if $$(wildcard $$@), \
-	  $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \
-	  $$($1_CAPTURE_CONTENTS) \
-	  $$($1_CAPTURE_METAINF) \
-	  $(RM) $$($1_DELETES_FILE) $$(NEWLINE) \
-	  $$($1_CAPTURE_DELETES) \
-	  $(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \
-	  if [ -s $$($1_DELETESS_FILE) ]; then \
-	    $(ECHO) "  deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
-	    $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
-	  fi $$(NEWLINE) \
-	  $$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
-	  $$($1_JARINDEX) && true \
-	, \
-	  $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
-	  $$($1_SCAPTURE_CONTENTS) \
-	  $$($1_SCAPTURE_METAINF) \
-	  $$($1_SUPDATE_CONTENTS) \
-	  $$($1_JARINDEX) && true )
-
-endef
-
-define SetupZipArchive
-  # param 1 is for example ZIP_MYSOURCE
-  # param 2,3,4,5,6,7,8,9 are named args.
-  #   SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
-
-  # To avoid running find over too large sets of files, which causes make to crash
-  # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
-  # of directories to run find in, if available.
-  ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
-    $1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \
-        $$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
-  else
-    $1_FIND_LIST := $$($1_SRC)
-  endif
-
-  # Find all files in the source tree.
-  $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
-
-  # Filter on suffixes if set
-  ifneq ($$($1_SUFFIXES),)
-    $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
-  endif
-
-  ifneq ($$($1_INCLUDES),)
-    ifneq ($$($1_SUFFIXES),)
-      $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \
-          $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
-    else
-      $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
-    endif
-  endif
-  ifneq ($$($1_INCLUDE_FILES),)
-    $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
-  endif
-  ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
-    $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
-    $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
-  endif
-
-  # Use a slightly shorter name for logging, but with enough path to identify this zip.
-  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP))
-
-  # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
-  # I.e. the zip -i and -x options should match the filtering done in the makefile.
-  # Explicitly excluded files can be given with absolute path. The patsubst solution
-  # isn't perfect but the likelyhood of an absolute path to match something in a src
-  # dir is very small.
-  # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
-  # and only fail if it's not.
-  $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
-	$(MKDIR) -p $$(@D)
-	$(ECHO) Updating $$($1_NAME)
-	$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
-	$(TOUCH) $$@
-endef
-
-define add_file_to_copy
-  # param 1 = BUILD_MYPACKAGE
-  # parma 2 = The source file to copy.
-  $2_TARGET:=$2
-  # Remove the source prefix.
-  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
-  # Now we can setup the depency that will trigger the copying.
-  $$($1_BIN)$$($2_TARGET) : $2
-	$(MKDIR) -p $$(@D)
-	$(CP) $$< $$@
-	$(CHMOD) -f ug+w $$@
-
-  # And do not forget this target
-  $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
-endef
-
-
-# This macro is used only for properties files that are to be
-# copied over to the classes directory in cleaned form:
-# Previously this was inconsistently done in different repositories.
-# This is the new clean standard. Though it is to be superseded by
-# a standard annotation processor from with sjavac.
-define add_file_to_copy_and_clean
-  # param 1 = BUILD_MYPACKAGE
-  # parma 2 = The source file to copy and clean.
-  $2_TARGET:=$2
-  # Remove the source prefix.
-  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
-  # Now we can setup the depency that will trigger the copying.
-  $$($1_BIN)$$($2_TARGET) : $2
-	$(MKDIR) -p $$(@D)
-	$(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
-	    | $(SED) -f "$(SRC_ROOT)/common/makefiles/support/unicode2x.sed" \
-	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
-	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
-	        -e 's/^[ \t]*//;s/[ \t]*$$$$//' \
-	        -e 's/\\=/=/' | LANG=C $(SORT) > $$@
-	$(CHMOD) -f ug+w $$@
-
-  # And do not forget this target
-  $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET)
-endef
-
-define remove_string
-  $2 := $$(subst $1,,$$($2))
-endef
-
-define replace_space_with_pathsep
-  $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
-endef
-
-define SetupJavaCompilation
-  # param 1 is for example BUILD_MYPACKAGE
-  # param 2,3,4,5,6,7,8 are named args.
-  #   SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
-  #   JVM:=path to ..bin/java
-  #   ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
-  #   SRC:=one or more directories to search for sources
-  #   BIN:=store classes here
-  #   INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
-  #   EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
-  #   COPY:=.prp means copy all prp files to the corresponding package in BIN.
-  #   CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
-  #   COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
-  #   SRCZIP:=Create a src.zip based on the found sources and copied files.
-  #   INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
-  #   EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
-  #       "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
-  #   JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
-  #       source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
-  #   HEADERS:=path to directory where all generated c-headers are written.
-  #   DEPENDS:=Extra dependecy
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk))
-
-  # Extract the info from the java compiler setup.
-  $1_JVM := $$($$($1_SETUP)_JVM)
-  $1_JAVAC := $$($$($1_SETUP)_JAVAC)
-  $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
-  ifeq ($$($1_JAVAC),)
-    $$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
-  endif
-  $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
-  $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
-
-  # Handle addons and overrides.
-  $1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
-  # Make sure the dirs exist.
-  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
-  $$(eval $$(call MakeDir,$$($1_BIN)))
-  # Find all files in the source trees.
-  $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
-  # Extract the java files.
-  ifneq ($$($1_EXCLUDE_FILES),)
-    $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
-  endif
-  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS)))
-  ifneq ($$($1_INCLUDE_FILES),)
-    $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
-    $1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS))
-  endif
-
-  # Now we have a list of all java files to compile: $$($1_SRCS)
-
-  # Create the corresponding smart javac wrapper command line.
-  $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
-      $$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
-      $$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
-      $$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
-      -src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
-
-  # Prepend the source/bin path to the filter expressions.
-  ifneq ($$($1_INCLUDES),)
-    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
-    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
-  endif
-  ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
-    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
-  endif
-
-  # Find all files to be copied from source to bin.
-  ifneq (,$$($1_COPY))
-    # Search for all files to be copied.
-    $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
-    # Copy these explicitly
-    $1_ALL_COPIES += $$($1_COPY_FILES)
-    # Copy must also respect filters.
-    ifneq (,$$($1_INCLUDES))
-      $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
-    endif
-    ifneq (,$$($1_EXCLUDES))
-      $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
-    endif
-    ifneq (,$$($1_EXCLUDE_FILES))
-      $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
-    endif
-    # All files below META-INF are always copied.
-    $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
-    ifneq (,$$($1_ALL_COPIES))
-      # Yep, there are files to be copied!
-      $1_ALL_COPY_TARGETS:=
-          $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
-      # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
-    endif
-  endif
-
-  # Find all property files to be copied and cleaned from source to bin.
-  ifneq (,$$($1_CLEAN))
-    # Search for all files to be copied.
-    $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
-    # Copy and clean must also respect filters.
-    ifneq (,$$($1_INCLUDES))
-      $1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
-    endif
-    ifneq (,$$($1_EXCLUDES))
-      $1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS))
-    endif
-    ifneq (,$$($1_EXCLUDE_FILES))
-      $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS))
-    endif
-    ifneq (,$$($1_ALL_CLEANS))
-      # Yep, there are files to be copied and cleaned!
-      $1_ALL_COPY_CLEAN_TARGETS:=
-          $$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_copy_and_clean,$1,$$i)))
-      # Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files!
-    endif
-  endif
-
-  # Prep the source paths.
-  ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
-    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
-  else
-    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
-  endif
-
-  # Create a sed expression to remove the source roots and to replace / with .
-  # and remove .java at the end.
-  $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
-
-  ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
-    ifneq (,$$($1_HEADERS))
-      $1_HEADERS_ARG := -h $$($1_HEADERS)
-    endif
-
-    # Using sjavac to compile.
-    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
-
-    # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
-    # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
-    # and javac is simply replaced with sjavac.
-    $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
-
-    # Set the $1_REMOTE to spawn a background javac server.
-    $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
-
-    $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
-	$(MKDIR) -p $$(@D)
-	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
-	$(ECHO) Compiling $1
-	($$($1_JVM) $$($1_SJAVAC) \
-	    $$($1_REMOTE) \
-	    -j $(JOBS) \
-	    --permit-unidentified-artifacts \
-	    --permit-sources-without-package \
-	    --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
-	    --log=$(LOG_LEVEL) \
-	    $$($1_SJAVAC_ARGS) \
-	    $$($1_FLAGS) \
-	    $$($1_HEADERS_ARG) \
-	    -d $$($1_BIN) && \
-	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
-  else
-    # Using plain javac to batch compile everything.
-    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
-
-    # When building in batch, put headers in a temp dir to filter out those that actually
-    # changed before copying them to the real header dir.
-    ifneq (,$$($1_HEADERS))
-      $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
-
-      $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
-		$(MKDIR) -p $$(@D)
-		for f in `ls $$($1_HEADERS).tmp`; do \
-		  if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \
-		    $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \
-		  fi; \
-		done
-		$(RM) -r $$($1_HEADERS).tmp
-		$(TOUCH) $$@
-
-      $1 += $$($1_HEADERS)/_the.$1_headers
-    endif
-
-    # When not using sjavac, pass along all sources to javac using an @file.
-    $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
-	$(MKDIR) -p $$(@D)
-	$(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp
-	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
-	$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
-	($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
-	    -implicit:none -sourcepath "$$($1_SRCROOTSC)" \
-	    -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
-	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
-
-  endif
-
-  # Check if a jar file was specified, then setup the rules for the jar.
-  ifneq (,$$($1_JAR))
-    # If no suffixes was explicitly set for this jar file.
-    # Use class and the cleaned/copied properties file suffixes as the default
-    # for the types of files to be put into the jar.
-    ifeq (,$$($1_SUFFIXES))
-      $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
-    endif
-
-    $$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1), \
-        SRCS:=$$($1_BIN), \
-        SUFFIXES:=$$($1_SUFFIXES), \
-        EXCLUDE:=$$($1_EXCLUDES), \
-        INCLUDES:=$$($1_INCLUDES), \
-        EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
-        JAR:=$$($1_JAR), \
-        JARMAIN:=$$($1_JARMAIN), \
-        MANIFEST:=$$($1_MANIFEST), \
-        EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
-        JARINDEX:=$$($1_JARINDEX), \
-        HEADERS:=$$($1_HEADERS), \
-        SETUP:=$$($1_SETUP)))
-  endif
-
-  # Check if a srczip was specified, then setup the rules for the srczip.
-  ifneq (,$$($1_SRCZIP))
-    $$(eval $$(call SetupZipArchive,ARCHIVE_$1, \
-        SRC:=$$($1_SRC), \
-        ZIP:=$$($1_SRCZIP), \
-        INCLUDES:=$$($1_INCLUDES), \
-        EXCLUDES:=$$($1_EXCLUDES), \
-        EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
-  endif
-
-endef
--- a/common/makefiles/Jprt.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-#
-# Copyright (c) 2012, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This file is included by the root NewerMakefile and contains targets
-# and utilities needed by JPRT.
-
-# Utilities used in this Makefile. Most of this makefile executes without
-# the context of a spec file from configure.
-CAT=cat
-CMP=cmp
-CP=cp
-ECHO=echo
-MKDIR=mkdir
-PRINTF=printf
-PWD=pwd
-# Insure we have a path that looks like it came from pwd
-# (This is mostly for Windows sake and drive letters)
-define UnixPath # path
-$(shell (cd "$1" && $(PWD)))
-endef
-
-BUILD_DIR_ROOT:=$(root_dir)/build
-
-ifdef OPENJDK
-  OPEN_BUILD=true
-else
-  OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
-      $(wildcard $(root_dir)/jdk/make/closed), \
-      $(wildcard $(root_dir)/jdk/test/closed), \
-      $(wildcard $(root_dir)/hotspot/src/closed), \
-      $(wildcard $(root_dir)/hotspot/make/closed), \
-      $(wildcard $(root_dir)/hotspot/test/closed)), \
-      false,true)
-endif
-
-HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
-
-###########################################################################
-# To help in adoption of the new configure&&make build process, a bridge
-# build will use the old settings to run configure and do the build.
-
-# Build with the configure bridge. After running configure, restart make
-# to parse the new spec file.
-BRIDGE_TARGETS := all
-# Add bootcycle-images target if legacy variable is set.
-ifeq ($(SKIP_BOOT_CYCLE),false)
-  BRIDGE_TARGETS += bootcycle-images
-endif
-bridgeBuild: bridge2configure
-	@cd $(root_dir) && $(MAKE) -f NewMakefile.gmk $(BRIDGE_TARGETS)
-
-# Bridge from old Makefile ALT settings to configure options
-bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
-	bash ./configure $(strip $(shell $(CAT) $<))
-
-# Create a file with configure options created from old Makefile mechanisms.
-$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
-	$(RM) $@
-	$(CP) $< $@
-
-# Use this file to only change when obvious things have changed
-$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
-	$(RM) $@.tmp
-	$(MKDIR) -p $(BUILD_DIR_ROOT)
-	@$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
-        ifdef ARCH_DATA_MODEL
-	  @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
-        endif
-        ifeq ($(ARCH_DATA_MODEL),32)
-	  @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp
-        endif
-        ifdef ALT_PARALLEL_COMPILE_JOBS
-	  @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
-        endif
-        ifdef ALT_BOOTDIR
-	  @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
-        endif
-        ifdef ALT_CUPS_HEADERS_PATH
-	  @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
-        endif
-        ifdef ALT_FREETYPE_HEADERS_PATH
-	  @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
-        endif
-        ifdef ENABLE_SJAVAC
-	  @$(ECHO) " --enable-sjavac" >> $@.tmp
-        endif
-        ifeq ($(HOTSPOT_AVAILABLE),false)
-          ifdef ALT_JDK_IMPORT_PATH
-	    @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
-          endif
-        endif
-        ifeq ($(OPEN_BUILD),true)
-	  @$(ECHO) " --enable-openjdk-only " >> $@.tmp
-        else
-#         Todo: move to closed?
-          ifdef ALT_MOZILLA_HEADERS_PATH
-	    @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
-          endif
-          ifdef ALT_JUNIT_DIR
-	    @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
-          endif
-          ifdef ANT_HOME
-	    @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
-          endif
-          ifdef ALT_JAVAFX_ZIP_DIR
-	    @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
-          endif
-          ifdef ALT_JMC_ZIP_DIR
-	    @$(ECHO) " --with-jmc-zip-dir=$(call UnixPath,$(ALT_JMC_ZIP_DIR)) " >> $@.tmp
-          endif
-          ifdef ALT_WIXDIR
-	    @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
-          endif
-          ifdef ALT_INSTALL_LZMA_PATH
-	    @$(ECHO) " --with-lzma-path=$(call UnixPath,$(ALT_INSTALL_LZMA_PATH)) " >> $@.tmp
-          endif
-          ifdef ALT_INSTALL_UPX_PATH
-	    @$(ECHO) " --with-upx-path=$(call UnixPath,$(ALT_INSTALL_UPX_PATH)) " >> $@.tmp
-          endif
-          ifdef ALT_INSTALL_UPX_FILENAME
-	    @$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
-          endif
-          ifdef ALT_CCSS_SIGNING_DIR
-	    @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
-          endif
-          ifdef ALT_SLASH_JAVA
-	    @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
-          endif
-          ifdef ALT_SPARKLE_FRAMEWORK_DIR
-	    @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
-          endif
-        endif
-	@if [ -f $@ ] ; then \
-	  if ! $(CMP) $@ $@.tmp > /dev/null ; then \
-	    $(CP) $@.tmp $@ ; \
-	  fi ; \
-	else \
-	  $(CP) $@.tmp $@ ; \
-	fi
-	$(RM) $@.tmp
-
-PHONY_LIST += bridge2configure bridgeBuild
-
-###########################################################################
-# JPRT targets
-
-ifndef JPRT_ARCHIVE_BUNDLE
-  JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
-endif
-ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
-  JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
-endif
-
-# These targets execute in a SPEC free context, before calling bridgeBuild
-# to generate the SPEC.
-jprt_build_product: DEBUG_LEVEL=release
-jprt_build_product: BUILD_DIRNAME=*-release
-jprt_build_product: jprt_build_generic
-
-jprt_build_fastdebug: DEBUG_LEVEL=fastdebug
-jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug
-jprt_build_fastdebug: jprt_build_generic
-
-jprt_build_debug: DEBUG_LEVEL=slowdebug
-jprt_build_debug: BUILD_DIRNAME=*-debug
-jprt_build_debug: jprt_build_generic
-
-jprt_build_generic: BRIDGE_TARGETS+=jprt_bundle
-jprt_build_generic: bridgeBuild
-
-# This target must be called in the context of a SPEC file
-jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
-	@$(call CheckIfMakeAtEnd)
-
-# This target must be called in the context of a SPEC file
-$(JPRT_ARCHIVE_BUNDLE): bundles
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-	$(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
-
-SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
-SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
-SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
-SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
-
-# Bundle up the images
-bundles: all bundles-only
-bundles-only: start-make
-	@$(call TargetEnter)
-	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
-	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
-	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
-	if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
-	  $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
-	fi
-	@$(call TargetExit)
-
-# Copy images to one unified location regardless of platform etc.
-final-images: all final-images-only
-final-images-only: start-make
-	@$(call TargetEnter)
-	$(RM) -r $(BUILD_OUTPUT)/final-images
-	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
-	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
-	$(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
-	$(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
-        ifeq ($(OPENJDK_TARGET_OS),macosx)
-	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
-	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
-	  $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
-	  $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
-        endif
-	@$(call TargetExit)
-
-
-# Keep track of phony targets
-PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
-    jprt_build_generic bundles jprt_bundle \
-    final-images final-images-only
-
-###########################################################################
-# Phony targets
-.PHONY: $(PHONY_LIST)
-
-# Force target
-FRC:
--- a/common/makefiles/Main.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +0,0 @@
-#
-# Copyright (c) 2011, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
-
-# Now load the spec
-include $(SPEC)
-
-# Load the vital tools for all the makefiles.
-include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
-
-# Include the corresponding custom file, if present.
--include $(CUSTOM_MAKE_DIR)/Main.gmk
-
-### Clean up from previous run
-
-# Remove any build.log from a previous run, if they exist
-ifneq (,$(BUILD_LOG))
-  ifneq (,$(BUILD_LOG_PREVIOUS))
-    # Rotate old log
-    $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
-    $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
-  else
-    $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
-  endif
-  $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
-endif
-# Remove any javac server logs and port files. This
-# prevents a new make run to reuse the previous servers.
-ifneq (,$(SJAVAC_SERVER_DIR))
-  $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
-endif
-
-# Reset the build timers.
-$(eval $(call ResetAllTimers))
-
-# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
-# hence this workaround.
-MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
-
-### Main targets
-
-default: jdk
-	@$(call CheckIfMakeAtEnd)
-
-all: images docs
-	@$(call CheckIfMakeAtEnd)
-
-# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
-# is up to date after changes to configure
-$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
-	@$(ECHO) ERROR: $(SPEC) is not up to date
-	@$(ECHO) Please rerun configure!
-	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
-
-start-make: $(SPEC)
-	@$(call AtMakeStart)
-
-langtools: langtools-only
-langtools-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(LANGTOOLS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildLangtools.gmk)
-	@$(call TargetExit)
-
-corba: langtools corba-only
-corba-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(CORBA_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildCorba.gmk)
-	@$(call TargetExit)
-
-jaxp: langtools jaxp-only
-jaxp-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JAXP_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxp.gmk)
-	@$(call TargetExit)
-
-jaxws: langtools jaxp jaxws-only
-jaxws-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JAXWS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxws.gmk)
-	@$(call TargetExit)
-
-ifeq ($(BUILD_HOTSPOT),true)
-  hotspot: hotspot-only
-  hotspot-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
-	@$(call TargetExit)
-endif
-
-jdk: langtools hotspot corba jaxp jaxws jdk-only
-jdk-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
-	@$(call TargetExit)
-
-nashorn: jdk nashorn-only
-nashorn-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
-	@$(call TargetExit)
-
-demos: jdk demos-only
-demos-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
-	@$(call TargetExit)
-
-# Note: This double-colon rule is intentional, to support
-# custom make file integration.
-images:: source-tips demos nashorn images-only
-images-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
-	@$(call TargetExit)
-
-overlay-images: source-tips demos overlay-images-only
-overlay-images-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
-	@$(call TargetExit)
-
-profiles: profiles-oscheck source-tips jdk hotspot profiles-only
-profiles-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
-	@$(call TargetExit)
-
-profiles-oscheck:
-        ifneq ($(OPENJDK_TARGET_OS), linux)
-	  @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
-        endif
-
-install: images install-only
-install-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk install)
-	@$(call TargetExit)
-
-docs: jdk docs-only
-docs-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
-	@$(call TargetExit)
-
-sign-jars: jdk sign-jars-only
-sign-jars-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
-	@$(call TargetExit)
-
-bootcycle-images: images bootcycle-images-only
-bootcycle-images-only: start-make
-	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
-	@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
-
-test: images test-only
-test-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
-	@$(call TargetExit)
-
-# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
-# used to track the exact sources used to build that image.
-source-tips: $(OUTPUT_ROOT)/source_tips
-$(OUTPUT_ROOT)/source_tips: FRC
-	@$(MKDIR) -p $(@D)
-	@$(RM) $@
-	@$(call GetSourceTips)
-
-
-# Remove everything, except the output from configure.
-clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs clean-test
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
-	@$(ECHO) Cleaned all build artifacts.
-
-# Remove everything, including configure configuration.
-# If the output directory was created by configure and now becomes empty, remove it as well.
-# FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
-dist-clean: clean
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
-	@$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
-	  if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
-	    $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
-	  else \
-	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
-	  fi \
-	)
-	@$(ECHO) Cleaned everything, you will have to re-run configure.
-
-clean-langtools:
-	$(call CleanComponent,langtools)
-clean-corba:
-	$(call CleanComponent,corba)
-clean-jaxp:
-	$(call CleanComponent,jaxp)
-clean-jaxws:
-	$(call CleanComponent,jaxws)
-clean-hotspot:
-	$(call CleanComponent,hotspot)
-clean-jdk:
-	$(call CleanComponent,jdk)
-clean-nashorn:
-	$(call CleanComponent,nashorn)
-clean-images:
-	$(call CleanComponent,images)
-clean-overlay-images:
-	$(call CleanComponent,overlay-images)
-clean-bootcycle-build:
-	$(call CleanComponent,bootcycle-build)
-clean-docs:
-	$(call CleanComponent,docs)
-	$(call CleanComponent,docstemp)
-clean-test:
-	$(call CleanComponent,testoutput)
-
-.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
-.PHONY: default all clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
-.PHONY: profiles profiles-only profiles-oscheck
-
-FRC: # Force target
--- a/common/makefiles/MakeBase.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,449 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-#
-# Check that GNU make and cygwin are recent enough.
-# Setup common utility functions.
-#
-################################################################
-
-ifndef _MAKEBASE_GMK
-_MAKEBASE_GMK := 1
-
-# If the variable that you want to send to stdout for piping into a file or otherwise,
-# is potentially long, for example the a list of file paths, eg a list of all package directories.
-# Then you need to use ListPathsSafely, which optimistically splits the output into several shell
-# calls as well as use compression on recurrent file paths segments, to get around the potential
-# command line length problem that exists in cygwin and other shells.
-compress_pre:=$(strip $(shell $(CAT) $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-pre-compress.incl))
-compress_post:=$(strip $(shell $(CAT) $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-post-compress.incl))
-compress_paths=$(compress_pre)\
-$(subst $(SRC_ROOT),X97,\
-$(subst $(OUTPUT_ROOT),X98,\
-$(subst X,X00,\
-$(subst $(SPACE),\n,$(strip $1)))))\
-$(compress_post)
-
-decompress_paths=$(SED) -f $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-uncompress.sed -e 's|X99|\\n|g' \
-    -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
-    -e 's|X00|X|g' | tr '\n' '$2'
-
-define ListPathsSafely_If
-	$(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
-endef
-
-define ListPathsSafely_Printf
-	$(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \
-	    -- "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3)
-endef
-
-# Receipt example:
-#   rm -f thepaths
-#   $(call ListPathsSafely,THEPATHS,\n, >> thepaths)
-# The \n argument means translate spaces into \n
-# if instead , , (a space) is supplied, then spaces remain spaces.
-define ListPathsSafely
-	$(if $(word 16001,$($1)),$(error Cannot list safely more than 16000 paths. $1 has $(words $($1)) paths!))
-	$(ECHO) $(LOG_DEBUG) Writing $(words $($1)) paths to '$3'
-	$(call ListPathsSafely_If,$1,$2,1,250)
-	$(call ListPathsSafely_If,$1,$2,251,500)
-	$(call ListPathsSafely_If,$1,$2,501,750)
-	$(call ListPathsSafely_If,$1,$2,751,1000)
-
-	$(call ListPathsSafely_If,$1,$2,1001,1250)
-	$(call ListPathsSafely_If,$1,$2,1251,1500)
-	$(call ListPathsSafely_If,$1,$2,1501,1750)
-	$(call ListPathsSafely_If,$1,$2,1751,2000)
-
-	$(call ListPathsSafely_If,$1,$2,2001,2250)
-	$(call ListPathsSafely_If,$1,$2,2251,2500)
-	$(call ListPathsSafely_If,$1,$2,2501,2750)
-	$(call ListPathsSafely_If,$1,$2,2751,3000)
-
-	$(call ListPathsSafely_If,$1,$2,3001,3250)
-	$(call ListPathsSafely_If,$1,$2,3251,3500)
-	$(call ListPathsSafely_If,$1,$2,3501,3750)
-	$(call ListPathsSafely_If,$1,$2,3751,4000)
-
-	$(call ListPathsSafely_If,$1,$2,4001,4250)
-	$(call ListPathsSafely_If,$1,$2,4251,4500)
-	$(call ListPathsSafely_If,$1,$2,4501,4750)
-	$(call ListPathsSafely_If,$1,$2,4751,5000)
-
-	$(call ListPathsSafely_If,$1,$2,5001,5250)
-	$(call ListPathsSafely_If,$1,$2,5251,5500)
-	$(call ListPathsSafely_If,$1,$2,5501,5750)
-	$(call ListPathsSafely_If,$1,$2,5751,6000)
-
-	$(call ListPathsSafely_If,$1,$2,6001,6250)
-	$(call ListPathsSafely_If,$1,$2,6251,6500)
-	$(call ListPathsSafely_If,$1,$2,6501,6750)
-	$(call ListPathsSafely_If,$1,$2,6751,7000)
-
-	$(call ListPathsSafely_If,$1,$2,7001,7250)
-	$(call ListPathsSafely_If,$1,$2,7251,7500)
-	$(call ListPathsSafely_If,$1,$2,7501,7750)
-	$(call ListPathsSafely_If,$1,$2,7751,8000)
-
-	$(call ListPathsSafely_If,$1,$2,8001,8250)
-	$(call ListPathsSafely_If,$1,$2,8251,8500)
-	$(call ListPathsSafely_If,$1,$2,8501,8750)
-	$(call ListPathsSafely_If,$1,$2,8751,9000)
-
-	$(call ListPathsSafely_If,$1,$2,9001,9250)
-	$(call ListPathsSafely_If,$1,$2,9251,9500)
-	$(call ListPathsSafely_If,$1,$2,9501,9750)
-	$(call ListPathsSafely_If,$1,$2,9751,10000)
-
-	$(call ListPathsSafely_If,$1,$2,10001,10250)
-	$(call ListPathsSafely_If,$1,$2,10251,10500)
-	$(call ListPathsSafely_If,$1,$2,10501,10750)
-	$(call ListPathsSafely_If,$1,$2,10751,11000)
-
-	$(call ListPathsSafely_If,$1,$2,11001,11250)
-	$(call ListPathsSafely_If,$1,$2,11251,11500)
-	$(call ListPathsSafely_If,$1,$2,11501,11750)
-	$(call ListPathsSafely_If,$1,$2,11751,12000)
-
-	$(call ListPathsSafely_If,$1,$2,12001,12250)
-	$(call ListPathsSafely_If,$1,$2,12251,12500)
-	$(call ListPathsSafely_If,$1,$2,12501,12750)
-	$(call ListPathsSafely_If,$1,$2,12751,13000)
-
-	$(call ListPathsSafely_If,$1,$2,13001,13250)
-	$(call ListPathsSafely_If,$1,$2,13251,13500)
-	$(call ListPathsSafely_If,$1,$2,13501,13750)
-	$(call ListPathsSafely_If,$1,$2,13751,14000)
-
-	$(call ListPathsSafely_If,$1,$2,14001,14250)
-	$(call ListPathsSafely_If,$1,$2,14251,14500)
-	$(call ListPathsSafely_If,$1,$2,14501,14750)
-	$(call ListPathsSafely_If,$1,$2,14751,15000)
-
-	$(call ListPathsSafely_If,$1,$2,15001,15250)
-	$(call ListPathsSafely_If,$1,$2,15251,15500)
-	$(call ListPathsSafely_If,$1,$2,15501,15750)
-	$(call ListPathsSafely_If,$1,$2,15751,16000)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,1)
-	$(call ListPathsSafely_Printf,$1,$2,$3,251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,1001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,1251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,1501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,1751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,2001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,2251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,2501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,2751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,3001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,3251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,3501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,3751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,4001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,4251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,4501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,4751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,5001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,5251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,5501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,5751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,6001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,6251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,6501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,6751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,7001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,7251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,7501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,7751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,8001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,8251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,8501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,8751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,9001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,9251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,9501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,9751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,10001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,10251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,10501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,10751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,11001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,11251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,11501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,11751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,12001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,12251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,12501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,12751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,13001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,13251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,13501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,13751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,14001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,14251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,14501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,14751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,15001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,15251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,15501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,15751)
-endef
-
-define ListPathsSafelyNow_IfPrintf
-  ifneq (,$$(word $4,$$($1)))
-    $$(eval $1_LPS$4:=$$(call compress_paths,$$(wordlist $4,$5,$$($1))))
-    $$(shell printf -- "$$(strip $$($1_LPS$4))\n" | $(decompress_paths) $3)
-  endif
-endef
-
-# And an non-receipt version:
-define ListPathsSafelyNow
-  ifneq (,$$(word 10001,$$($1)))
-    $$(error Cannot list safely more than 10000 paths. $1 has $$(words $$($1)) paths!)
-  endif
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1,250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,251,500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,501,750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,751,1000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1001,1250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1251,1500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1501,1750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1751,2000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2001,2250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2251,2500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2501,2750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2751,3000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3001,3250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3251,3500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3501,3750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3751,4000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4001,4250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4251,4500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4501,4750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4751,5000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5001,5250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5251,5500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5501,5750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5751,6000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6001,6250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6251,6500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6501,6750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6751,7000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7001,7250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7251,7500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7501,7750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7751,8000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8001,8250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8251,8500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8501,8750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8751,9000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9001,9250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9251,9500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9501,9750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9751,10000)
-
-endef
-
-# The source tips can come from the Mercurial repository, or in the files
-# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
-# directory as the original $(HGDIR) directory.
-# These should not be := assignments, only used from the root Makefile.
-HG_VERSION = $(shell $(HG) version 2> /dev/null)
-HG_DIRECTORY=.hg
-HGTIP_FILENAME=.hgtip
-HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
-REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
-    $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \
-        $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
-        2> /dev/null)))))
-
-# Emit the repo:tip pairs to $@
-define GetSourceTips
-	$(CD) $(SRC_ROOT) ; \
-	for i in $(REPO_LIST) IGNORE ; do \
-	  if [ "$${i}" = "IGNORE" ] ; then \
-	    continue; \
-	  elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
-	    $(PRINTF) " %s:%s" \
-	        "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
-	  elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
-	    $(PRINTF) " %s:%s" \
-	        "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
-	  fi; \
-	done >> $@
-	$(PRINTF) "\n" >> $@
-endef
-
-# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
-define CreateHgTip
-	$(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \
-	$(ECHO) $1/$(HGTIP_FILENAME)
-endef
-
-define SetupLogging
-  ifeq ($$(LOG_LEVEL),trace)
-    # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
-    # For each target executed, will print
-    # Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer)
-    # but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much
-    # (and causing a crash on Cygwin).
-    # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
-    # Only use time if it's GNU time which supports format and output file.
-    WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
-    SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
-  endif
-  # Never remove warning messages; this is just for completeness
-  LOG_WARN=
-  ifneq ($$(findstring $$(LOG_LEVEL),info debug trace),)
-    LOG_INFO=
-  else
-    LOG_INFO=> /dev/null
-  endif
-  ifneq ($$(findstring $$(LOG_LEVEL),debug trace),)
-    LOG_DEBUG=
-  else
-    LOG_DEBUG=> /dev/null
-  endif
-  ifneq ($$(findstring $$(LOG_LEVEL),trace),)
-    LOG_TRACE=
-  else
-    LOG_TRACE=> /dev/null
-  endif
-endef
-
-# Make sure logging is setup for everyone that includes MakeBase.gmk.
-$(eval $(call SetupLogging))
-
-# This is to be called by all SetupFoo macros
-define LogSetupMacroEntry
-  $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
-  $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
-endef
-
-# Make directory without forking mkdir if not needed
-define MakeDir
-  ifneq ($$(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),$$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9))
-    $$(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9)
-  endif
-endef
-
-ifeq ($(OPENJDK_TARGET_OS),solaris)
-  # On Solaris, if the target is a symlink and exists, cp won't overwrite.
-  # Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the
-  # name of the target file differs from the source file, rename after copy.
-  define install-file
-	$(MKDIR) -p $(@D)
-	$(RM) '$@'
-	$(CP) -f -r -P '$<' '$(@D)'
-	if [ "$(@F)" != "$(<F)" ]; then $(MV) '$(@D)/$(<F)' '$@'; fi
-  endef
-else ifeq ($(OPENJDK_TARGET_OS),macosx)
-  # On mac, extended attributes sometimes creep into the source files, which may later
-  # cause the creation of ._* files which confuses testing. Clear these with xattr if
-  # set. Some files get their write permissions removed after being copied to the
-  # output dir. When these are copied again to images, xattr would fail. By only clearing
-  # attributes when they are present, failing on this is avoided.
-  define install-file
-	$(MKDIR) -p $(@D)
-	$(CP) -fRP '$<' '$@'
-	if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
-  endef
-else
-  define install-file
-	$(MKDIR) -p $(@D)
-	$(CP) -fP '$<' '$@'
-  endef
-endif
-
-# Convenience functions for working around make's limitations with $(filter ).
-containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
-not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
-
-################################################################################
-# In Cygwin, finds are very costly, both because of expensive forks and because
-# of bad file system caching. Find is used extensively in $(shell) commands to
-# find source files. This makes rerunning make with no or few changes rather
-# expensive. To speed this up, these two macros are used to cache the results
-# of simple find commands for reuse.
-#
-# Runs a find and stores both the directories where it was run and the results.
-# This macro can be called multiple times to add to the cache. Only finds files
-# with no filters.
-#
-# Needs to be called with $(eval )
-#
-# Param 1 - Dir to find in
-ifeq ($(OPENJDK_BUILD_OS),windows)
-  define FillCacheFind
-    FIND_CACHE_DIR += $1
-    FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l))
-  endef
-else
-  define FillCacheFind
-  endef
-endif
-
-# Mimics find by looking in the cache if all of the directories have been cached.
-# Otherwise reverts to shell find. This is safe to call on all platforms, even if
-# cache is deactivated.
-#
-# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless.
-# Param 1 - Dirs to find in
-define CacheFind
-  $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1), \
-    $(shell $(FIND) $1 -type f -o -type l), \
-    $(filter $(addsuffix %,$1),$(FIND_CACHE)))
-endef
-
-################################################################################
-
-endif # _MAKEBASE_GMK
--- a/common/makefiles/MakeHelpers.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,306 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-#
-# This file contains helper functions for the top-level Makefile that does
-# not depend on the spec.gmk file having been read. (The purpose of this
-# file is ju to avoid cluttering the top-level Makefile.)
-#
-################################################################
-
-ifndef _MAKEHELPERS_GMK
-_MAKEHELPERS_GMK := 1
-
-##############################
-# Stuff to run at include time
-##############################
-
-# Find out which variables were passed explicitely on the make command line. These
-# will be passed on to sub-makes, overriding spec.gmk settings.
-MAKE_ARGS=$(foreach var,$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))),$(var)=$($(var)))
-
-list_alt_overrides_with_origins=$(filter ALT_%=environment ALT_%=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))
-list_alt_overrides=$(subst =command,,$(subst =environment,,$(list_alt_overrides_with_origins)))
-
-# Store the build times in this directory.
-BUILDTIMESDIR=$(OUTPUT_ROOT)/tmp/buildtimes
-
-# Global targets are possible to run either with or without a SPEC. The prototypical
-# global target is "help".
-global_targets=help jprt% bridgeBuild
-
-##############################
-# Functions
-##############################
-
-define CheckEnvironment
-        # Find all environment or command line variables that begin with ALT.
-	$(if $(list_alt_overrides),
-	  @$(PRINTF) "\nWARNING: You have the following ALT_ variables set:\n"
-	  @$(PRINTF) "$(foreach var,$(list_alt_overrides),$(var)=$$$(var))\n"
-	  @$(PRINTF) "ALT_ variables are deprecated and will be ignored. Please clean your environment.\n\n"
-	)
-endef
-
-### Functions for timers
-
-# Record starting time for build of a sub repository.
-define RecordStartTime
-	$(MKDIR) -p $(BUILDTIMESDIR)
-	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$1
-	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$1_human_readable
-endef
-
-# Record ending time and calculate the difference and store it in a
-# easy to read format. Handles builds that cross midnight. Expects
-# that a build will never take 24 hours or more.
-define RecordEndTime
-	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$1
-	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$1_human_readable
-	$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$1` $1 | \
-	    $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
-	    M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
-	    > $(BUILDTIMESDIR)/build_time_diff_$1
-endef
-
-# Find all build_time_* files and print their contents in a list sorted
-# on the name of the sub repository.
-define ReportBuildTimes
-	$(BUILD_LOG_WRAPPER) $(PRINTF) -- "----- Build times -------\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
-	    "`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | $(XARGS) $(CAT) | $(SORT) -k 2`" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`"
-endef
-
-define ResetAllTimers
-  $$(shell $(MKDIR) -p $(BUILDTIMESDIR) && $(RM) $(BUILDTIMESDIR)/build_time_*)
-endef
-
-define StartGlobalTimer
-	$(call RecordStartTime,TOTAL)
-endef
-
-define StopGlobalTimer
-	$(call RecordEndTime,TOTAL)
-endef
-
-### Functions for managing makefile structure (start/end of makefile and individual targets)
-
-# Do not indent this function, this will add whitespace at the start which the caller won't handle
-define GetRealTarget
-$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default))
-endef
-
-# Do not indent this function, this will add whitespace at the start which the caller won't handle
-define LastGoal
-$(strip $(lastword $(call GetRealTarget)))
-endef
-
-# Check if the current target is the final target, as specified by
-# the user on the command line. If so, call AtRootMakeEnd.
-define CheckIfMakeAtEnd
-        # Check if the current target is the last goal
-	$(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd))
-        # If the target is 'foo-only', check if our goal was stated as 'foo'
-	$(if $(filter $@,$(call LastGoal)-only),$(call AtMakeEnd))
-endef
-
-# Hook to be called when starting to execute a top-level target
-define TargetEnter
-	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
-	$(call RecordStartTime,$(patsubst %-only,%,$@))
-endef
-
-# Hook to be called when finish executing a top-level target
-define TargetExit
-	$(call RecordEndTime,$(patsubst %-only,%,$@))
-	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`"
-	$(call CheckIfMakeAtEnd)
-endef
-
-# Hook to be called as the very first thing when running a normal build
-define AtMakeStart
-	$(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
-	$(call CheckEnvironment)
-	@$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
-	@$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
-	$(call StartGlobalTimer)
-endef
-
-# Hook to be called as the very last thing for targets that are "top level" targets
-define AtMakeEnd
-	[ -f $(SJAVAC_SERVER_DIR)/server.port ] && echo Stopping sjavac server && $(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
-	$(call StopGlobalTimer)
-	$(call ReportBuildTimes)
-	@$(PRINTF) "Finished building $(PRODUCT_NAME) for target '$(call GetRealTarget)'\n"
-	$(call CheckEnvironment)
-endef
-
-### Functions for parsing and setting up make options from command-line
-
-define FatalError
-  # If the user specificed a "global" target (e.g. 'help'), do not exit but continue running
-  $$(if $$(filter-out $(global_targets),$$(call GetRealTarget)),$$(error Cannot continue))
-endef
-
-define ParseLogLevel
-  ifeq ($$(origin VERBOSE),undefined)
-    # Setup logging according to LOG (but only if VERBOSE is not given)
-
-    # If the "nofile" argument is given, act on it and strip it away
-    ifneq ($$(findstring nofile,$$(LOG)),)
-      # Reset the build log wrapper, regardless of other values
-      override BUILD_LOG_WRAPPER=
-      # COMMA is defined in spec.gmk, but that is not included yet
-      COMMA=,
-      # First try to remove ",nofile" if it exists
-      LOG_STRIPPED1=$$(subst $$(COMMA)nofile,,$$(LOG))
-      # Otherwise just remove "nofile"
-      LOG_STRIPPED2=$$(subst nofile,,$$(LOG_STRIPPED1))
-      # We might have ended up with a leading comma. Remove it
-      LOG_STRIPPED3=$$(strip $$(patsubst $$(COMMA)%,%,$$(LOG_STRIPPED2)))
-      LOG_LEVEL:=$$(LOG_STRIPPED3)
-    else
-      LOG_LEVEL:=$$(LOG)
-    endif
-
-    ifeq ($$(LOG_LEVEL),)
-      # Set LOG to "warn" as default if not set (and no VERBOSE given)
-      override LOG_LEVEL=warn
-    endif
-    ifeq ($$(LOG_LEVEL),warn)
-      VERBOSE=-s
-    else ifeq ($$(LOG_LEVEL),info)
-      VERBOSE=-s
-    else ifeq ($$(LOG_LEVEL),debug)
-      VERBOSE=
-    else ifeq ($$(LOG_LEVEL),trace)
-      VERBOSE=
-    else
-      $$(info Error: LOG must be one of: warn, info, debug or trace.)
-      $$(eval $$(call FatalError))
-    endif
-  else
-    # Provide resonable interpretations of LOG_LEVEL if VERBOSE is given.
-    ifeq ($(VERBOSE),)
-      LOG_LEVEL:=debug
-    else
-      LOG_LEVEL:=warn
-    endif
-    ifneq ($$(LOG),)
-      # We have both a VERBOSE and a LOG argument. This is OK only if this is a repeated call by ourselves,
-      # but complain if this is the top-level make call.
-      ifeq ($$(MAKELEVEL),0)
-        $$(info Cannot use LOG=$$(LOG) and VERBOSE=$$(VERBOSE) at the same time. Choose one.)
-        $$(eval $$(call FatalError))
-      endif
-    endif
-  endif
-endef
-
-define ParseConfAndSpec
-  ifneq ($$(filter-out $(global_targets),$$(call GetRealTarget)),)
-    # If we only have global targets, no need to bother with SPEC or CONF
-    ifneq ($$(origin SPEC),undefined)
-      # We have been given a SPEC, check that it works out properly
-      ifeq ($$(wildcard $$(SPEC)),)
-        $$(info Cannot locate spec.gmk, given by SPEC=$$(SPEC))
-        $$(eval $$(call FatalError))
-      endif
-      ifneq ($$(origin CONF),undefined)
-        # We also have a CONF argument. This is OK only if this is a repeated call by ourselves,
-        # but complain if this is the top-level make call.
-        ifeq ($$(MAKELEVEL),0)
-          $$(info Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
-          $$(eval $$(call FatalError))
-        endif
-      endif
-      # ... OK, we're satisfied, we'll use this SPEC later on
-    else
-      # Find all spec.gmk files in the build output directory
-      output_dir=$$(root_dir)/build
-      all_spec_files=$$(wildcard $$(output_dir)/*/spec.gmk)
-      ifeq ($$(all_spec_files),)
-        $$(info No configurations found for $$(root_dir)! Please run configure to create a configuration.)
-        $$(eval $$(call FatalError))
-      endif
-      # Extract the configuration names from the path
-      all_confs=$$(patsubst %/spec.gmk,%,$$(patsubst $$(output_dir)/%,%,$$(all_spec_files)))
-
-      ifneq ($$(origin CONF),undefined)
-        # User have given a CONF= argument.
-        ifeq ($$(CONF),)
-          # If given CONF=, match all configurations
-          matching_confs=$$(strip $$(all_confs))
-        else
-          # Otherwise select those that contain the given CONF string
-          matching_confs=$$(strip $$(foreach var,$$(all_confs),$$(if $$(findstring $$(CONF),$$(var)),$$(var))))
-        endif
-        ifeq ($$(matching_confs),)
-          $$(info No configurations found matching CONF=$$(CONF))
-          $$(info Available configurations:)
-          $$(foreach var,$$(all_confs),$$(info * $$(var)))
-          $$(eval $$(call FatalError))
-        else
-          ifeq ($$(words $$(matching_confs)),1)
-            $$(info Building '$$(matching_confs)' (matching CONF=$$(CONF)))
-          else
-            $$(info Building target '$(call GetRealTarget)' in the following configurations (matching CONF=$$(CONF)):)
-            $$(foreach var,$$(matching_confs),$$(info * $$(var)))
-          endif
-        endif
-
-        # Create a SPEC definition. This will contain the path to one or more spec.gmk files.
-        SPEC=$$(addsuffix /spec.gmk,$$(addprefix $$(output_dir)/,$$(matching_confs)))
-      else
-        # No CONF or SPEC given, check the available configurations
-        ifneq ($$(words $$(all_spec_files)),1)
-          $$(info No CONF given, but more than one configuration found in $$(output_dir).)
-          $$(info Available configurations:)
-          $$(foreach var,$$(all_confs),$$(info * $$(var)))
-          $$(info Please retry building with CONF=<config pattern> (or SPEC=<specfile>))
-          $$(eval $$(call FatalError))
-        endif
-
-        # We found exactly one configuration, use it
-        SPEC=$$(strip $$(all_spec_files))
-      endif
-    endif
-  endif
-endef
-
-### Convenience functions from Main.gmk
-
-# Cleans the component given as $1
-define CleanComponent
-	@$(PRINTF) "Cleaning $1 build artifacts ..."
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r $1)
-	@$(PRINTF) " done\n"
-endef
-
-endif # _MAKEHELPERS_GMK
--- a/common/makefiles/Makefile	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include ../../NewMakefile.gmk
--- a/common/makefiles/NativeCompilation.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,594 +0,0 @@
-#
-# Copyright (c) 2011, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# When you read this source. Remember that $(sort ...) has the side effect
-# of removing duplicates. It is actually this side effect that is
-# desired whenever sort is used below!
-
-ifeq (,$(_MAKEBASE_GMK))
-  $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
-endif
-
-ifeq ($(COMPILER_TYPE),CC)
-  COMPILING_MSG=echo $(LOG_INFO) "Compiling $(notdir $1) (for $(notdir $2))"
-  LINKING_MSG=echo $(LOG_INFO) "Linking $1"
-  LINKING_EXE_MSG=echo $(LOG_INFO) "Linking executable $1"
-  ARCHIVING_MSG=echo $(LOG_INFO) "Archiving $1"
-else
-  COMPILING_MSG=
-  LINKING_MSG=
-  LINKING_EXE_MSG=
-  ARCHIVING_MSG=
-endif
-
-define add_native_source
-  # param 1 = BUILD_MYPACKAGE
-  # parma 2 = the source file name (..../alfa.c or .../beta.cpp)
-  # param 3 = the bin dir that stores all .o (.obj) and .d files.
-  # param 4 = the c flags to the compiler
-  # param 5 = the c compiler
-  # param 6 = the c++ flags to the compiler
-  # param 7 = the c++ compiler
-  # param 8 = the flags to the assembler
-
-  ifneq (,$$(filter %.c,$2))
-    # Compile as a C file
-    $1_$2_FLAGS=$4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
-    $1_$2_COMP=$5
-    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
-  else ifneq (,$$(filter %.m,$2))
-    # Compile as a objective-c file
-    $1_$2_FLAGS=-x objective-c $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
-    $1_$2_COMP=$5
-    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
-  else ifneq (,$$(filter %.s,$2))
-    # Compile as assembler file
-    $1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"'
-    $1_$2_COMP=$(AS)
-    $1_$2_DEP_FLAG:=
-  else
-    # Compile as a C++ file
-    $1_$2_FLAGS=$6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
-    $1_$2_COMP=$7
-    $1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS)
-  endif
-  # Generate the .o (.obj) file name and place it in the bin dir.
-  $1_$2_OBJ:=$3/$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $2)))))
-  # Only continue if this object file hasn't been processed already. This lets the first found
-  # source file override any other with the same name.
-  ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_OBJS_SO_FAR)))
-    $1_OBJS_SO_FAR+=$$($1_$2_OBJ)
-    ifeq (,$$(filter %.s,$2))
-      # And this is the dependency file for this obj file.
-      $1_$2_DEP:=$$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_$2_OBJ))
-      # Include previously generated dependency information. (if it exists)
-      -include $$($1_$2_DEP)
-
-      ifeq ($(COMPILER_TYPE),CL)
-        $1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \
-            -Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ))
-      endif
-    endif
-
-    $$($1_$2_OBJ) : $2
-        ifeq ($(COMPILER_TYPE),CC)
-	  $$(call COMPILING_MSG,$2,$$($1_TARGET))
-          # The Sun studio compiler doesn't output the full path to the object file in the
-          # generated deps files. Fixing it with sed. If compiling assembly, don't try this.
-          ifeq ($(COMPILER_NAME)$$(filter %.s,$2),ossc)
-	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
-	    $(SED) 's|^$$(@F):|$$@:|' $$($1_$2_DEP).tmp > $$($1_$2_DEP)
-          else
-	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
-          endif
-        endif
-        # The Visual Studio compiler lacks a feature for generating make dependencies, but by
-        # setting -showIncludes, all included files are printed. These are filtered out and
-        # parsed into make dependences.
-        ifeq ($(COMPILER_TYPE),CL)
-	  ($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
-	      $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \
-	      | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v "^Note: including file:" \
-	      && exit `cat $$($1_$2_DEP).exitvalue`
-	  $(RM) $$($1_$2_DEP).exitvalue
-	  ($(ECHO) $$@: \\ \
-	  && $(SED) -e '/^Note: including file:/!d' \
-	      -e 's|Note: including file: *||' \
-	      -e 's|\\|/|g' \
-	      -e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \
-	      -e '/$(subst /,\/,$(TOPDIR))/!d' \
-	      -e 's|$$$$| \\|g' \
-	      $$($1_$2_DEP).raw) > $$($1_$2_DEP)
-        endif
-  endif
-endef
-
-define SetupNativeCompilation
-  # param 1 is for example BUILD_MYPACKAGE
-  # param 2,3,4,5,6,7,8 are named args.
-  #   SRC one or more directory roots to scan for C/C++ files.
-  #   LANG C or C++
-  #   CFLAGS the compiler flags to be used, used both for C and C++.
-  #   CXXFLAGS the compiler flags to be used for c++, if set overrides CFLAGS.
-  #   LDFLAGS the linker flags to be used, used both for C and C++.
-  #   LDFLAGS_SUFFIX the linker flags to be added last on the commandline
-  #       typically the libraries linked to.
-  #   ARFLAGS the archiver flags to be used
-  #   OBJECT_DIR the directory where we store the object files
-  #   LIBRARY the resulting library file
-  #   PROGRAM the resulting exec file
-  #   INCLUDES only pick source from these directories
-  #   EXCLUDES do not pick source from these directories
-  #   INCLUDE_FILES only compile exactly these files!
-  #   EXCLUDE_FILES with these names
-  #   VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run
-  #   RC_FLAGS flags for RC.
-  #   MAPFILE mapfile
-  #   REORDER reorder file
-  #   DEBUG_SYMBOLS add debug symbols (if configured on)
-  #   CC the compiler to use, default is $(CC)
-  #   LDEXE the linker to use for linking executables, default is $(LDEXE)
-  #   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26))
-  $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
-
-  ifneq (,$$($1_BIN))
-    $$(error BIN has been replaced with OBJECT_DIR)
-  endif
-
-  ifneq (,$$($1_LIB))
-    $$(error LIB has been replaced with LIBRARY)
-  endif
-
-  ifneq (,$$($1_EXE))
-    $$(error EXE has been replaced with PROGRAM)
-  endif
-
-  ifneq (,$$($1_LIBRARY))
-    ifeq (,$$($1_OUTPUT_DIR))
-      $$(error LIBRARY requires OUTPUT_DIR)
-    endif
-
-    ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY)))
-      $$(error directory of LIBRARY should be specified using OUTPUT_DIR)
-    endif
-
-    ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY)))
-      $$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX))
-    endif
-
-    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY)))
-      $$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
-    endif
-
-    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$(SHARED_LIBRARY_SUFFIX)
-    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
-
-  endif
-
-  ifneq (,$$($1_STATIC_LIBRARY))
-    ifeq (,$$($1_OUTPUT_DIR))
-      $$(error STATIC_LIBRARY requires OUTPUT_DIR)
-    endif
-
-    ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY)))
-      $$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR)
-    endif
-
-    ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY)))
-      $$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX))
-    endif
-
-    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY)))
-      $$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
-    endif
-
-    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$(STATIC_LIBRARY_SUFFIX)
-    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
-  endif
-
-  ifneq (,$$($1_PROGRAM))
-    ifeq (,$$($1_OUTPUT_DIR))
-      $$(error PROGRAM requires OUTPUT_DIR)
-    endif
-
-    ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM)))
-      $$(error directory of PROGRAM should be specified using OUTPUT_DIR)
-    endif
-
-    ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM)))
-      $$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX))
-    endif
-
-    $1_BASENAME:=$$($1_PROGRAM)$(EXE_SUFFIX)
-    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
-
-  endif
-
-  ifeq (,$$($1_TARGET))
-    $$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation)
-  endif
-
-  ifeq (,$$($1_LANG))
-    $$(error You have to specify LANG for native compilation $1)
-  endif
-  ifeq (C,$$($1_LANG))
-    ifeq ($$($1_LDEXE),)
-      $1_LDEXE:=$(LDEXE)
-    endif
-    $1_LD:=$(LD)
-  else
-    ifeq (C++,$$($1_LANG))
-      $1_LD:=$(LDCXX)
-      $1_LDEXE:=$(LDEXECXX)
-    else
-      $$(error Unknown native language $$($1_LANG) for $1)
-    endif
-  endif
-
-  ifeq ($$($1_CC),)
-    $1_CC:=$(CC)
-  endif
-
-  # Make sure the dirs exist.
-  $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
-  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
-
-  # Find all files in the source trees. Sort to remove duplicates.
-  $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
-  # Extract the C/C++ files.
-  $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
-  $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
-  ifneq ($$($1_EXCLUDE_FILES),)
-    $1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES))
-  endif
-  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter %.s %.c %.cpp %.m,$$($1_ALL_SRCS)))
-  ifneq (,$$(strip $$($1_INCLUDE_FILES)))
-    $1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS))
-  endif
-  ifeq (,$$($1_SRCS))
-    $$(error No sources found for $1 when looking inside the dirs $$($1_SRC))
-  endif
-  # There can be only a single bin dir root, no need to foreach over the roots.
-  $1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX))
-  # Now we have a list of all c/c++ files to compile: $$($1_SRCS)
-  # and we have a list of all existing object files: $$($1_BINS)
-
-  # Prepend the source/bin path to the filter expressions. Then do the filtering.
-  ifneq ($$($1_INCLUDES),)
-    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
-    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
-  endif
-  ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
-    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
-  endif
-
-  # Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides
-  # a reproducable order on the input files to the linker).
-  $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $$($1_SRCS))))))))
-  # Are there too many object files on disk? Perhaps because some source file was removed?
-  $1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS)))
-  # Clean out the superfluous object files.
-  ifneq ($$($1_SUPERFLUOUS_OBJS),)
-    $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
-  endif
-
-  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS.
-  $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
-  ifneq ($(DEBUG_LEVEL),release)
-    # Pickup extra debug dependent variables for CFLAGS
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
-  else
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
-  endif
-
-  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
-  $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
-  ifneq ($(DEBUG_LEVEL),release)
-    # Pickup extra debug dependent variables for CXXFLAGS
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
-  else
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
-  endif
-
-  ifneq (,$$($1_DEBUG_SYMBOLS))
-    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-      ifdef OPENJDK
-        # Always add debug symbols
-        $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
-        $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
-      else
-        # Programs don't get the debug symbols added in the old build. It's not clear if
-        # this is intentional.
-        ifeq ($$($1_PROGRAM),)
-          $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
-          $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
-        endif
-      endif
-    endif
-  endif
-
-  ifeq ($$($1_CXXFLAGS),)
-    $1_CXXFLAGS:=$$($1_CFLAGS)
-  endif
-  ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
-    $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
-  endif
-
-  ifneq (,$$($1_REORDER))
-    $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
-    $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)
-  endif
-
-  ifeq (NONE, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_NONE)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE)
-  else ifeq (LOW, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_NORM)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM)
-  else ifeq (HIGH, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_HI)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI)
-  else ifeq (HIGHEST, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
-  else ifneq (, $$($1_OPTIMIZATION))
-    $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
-  endif
-
-  # Now call add_native_source for each source file we are going to compile.
-  $$(foreach p,$$($1_SRCS), \
-      $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
-          $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
-          $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
-
-  # On windows we need to create a resource file
-  ifeq ($(OPENJDK_TARGET_OS), windows)
-    ifneq (,$$($1_VERSIONINFO_RESOURCE))
-      $1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res
-      $$($1_RES): $$($1_VERSIONINFO_RESOURCE)
-		$(RC) $$($1_RC_FLAGS) $(CC_OUT_OPTION)$$@ $$($1_VERSIONINFO_RESOURCE)
-    endif
-    ifneq (,$$($1_MANIFEST))
-      $1_GEN_MANIFEST:=$$($1_OBJECT_DIR)/$$($1_PROGRAM).manifest
-      IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER)
-      $$($1_GEN_MANIFEST): $$($1_MANIFEST)
-		$(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@
-    endif
-  endif
-
-  # mapfile doesnt seem to be implemented on macosx (yet??)
-  ifneq ($(OPENJDK_TARGET_OS),macosx)
-    ifneq ($(OPENJDK_TARGET_OS),windows)
-      $1_REAL_MAPFILE:=$$($1_MAPFILE)
-      ifneq (,$$($1_REORDER))
-        $1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile
-
-        $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
-		$$(MKDIR) -p $$(@D)
-		$$(CP) $$($1_MAPFILE) $$@.tmp
-		$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
-		$$(MV) $$@.tmp $$@
-      endif
-    endif
-  endif
-
-  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables
-  # for LDFLAGS and LDFLAGS_SUFFIX
-  $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
-  $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
-  ifneq (,$$($1_REAL_MAPFILE))
-    $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
-  endif
-
-  $1 := $$($1_TARGET)
-  ifneq (,$$($1_LIBRARY))
-    # Generating a dynamic library.
-    $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
-    ifeq ($(OPENJDK_TARGET_OS), windows)
-      $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib"
-    endif
-
-    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
-
-    ifneq (,$$($1_DEBUG_SYMBOLS))
-      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-        ifeq ($(OPENJDK_TARGET_OS), windows)
-          $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \
-              "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map"
-        endif
-
-        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
-          $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
-		$(CP) $$< $$@
-        endif
-
-        ifneq ($(OPENJDK_TARGET_OS), macosx)   # OBJCOPY is not used on MacOS X
-          ifneq ($(OPENJDK_TARGET_OS), windows)  # nor on Windows
-            ifeq ($(OPENJDK_TARGET_OS), solaris)
-              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-              # empty section headers until a fixed $(OBJCOPY) is available.
-              # An empty section header has sh_addr == 0 and sh_size == 0.
-              # This problem has only been seen on Solaris X64, but we call this tool
-              # on all Solaris builds just in case.
-              #
-              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-              $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
-				$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
-		$(RM) $$@
-		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-            else # not solaris
-              $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
-		$(RM) $$@
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-            endif # Touch to not retrigger rule on rebuild
-		$(TOUCH) $$@
-          endif # !windows
-        endif # !macosx
-
-        ifeq ($(ZIP_DEBUGINFO_FILES), true)
-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
-          $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
-
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET)
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb
-          else
-            $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \
-                $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-          endif
-endif # no MacOS X support yet
-        else
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
-                $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
-          else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-            $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-          endif
-        endif
-      endif
-    endif
-
-    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE)
-	$$(call LINKING_MSG,$$($1_BASENAME))
-	$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(LD_OUT_OPTION)$$@ \
-	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
-	$$($1_EXTRA_LDFLAGS_SUFFIX)
-
-  endif
-
-  ifneq (,$$($1_STATIC_LIBRARY))
-    # Generating a static library, ie object file archive.
-    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES)
-	$$(call ARCHIVING_MSG,$$($1_LIBRARY))
-	$(AR) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \
-	    $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
-  endif
-
-  ifneq (,$$($1_PROGRAM))
-    # A executable binary has been specified, setup the target for it.
-    ifneq (,$$($1_DEBUG_SYMBOLS))
-      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-        ifeq ($(OPENJDK_TARGET_OS), windows)
-          $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \
-              "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map"
-        endif
-
-        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
-          $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
-		$(CP) $$< $$@
-        endif
-
-        ifneq ($(OPENJDK_TARGET_OS), macosx)   # OBJCOPY is not used on MacOS X
-          ifneq ($(OPENJDK_TARGET_OS), windows)  # nor on Windows
-            ifeq ($(OPENJDK_TARGET_OS), solaris)
-              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-              # empty section headers until a fixed $(OBJCOPY) is available.
-              # An empty section header has sh_addr == 0 and sh_size == 0.
-              # This problem has only been seen on Solaris X64, but we call this tool
-              # on all Solaris builds just in case.
-              #
-              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-              $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
-				$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
-		$(RM) $$@
-		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-            else # not solaris
-              $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
-		$(RM) $$@
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-            endif
-		$(TOUCH) $$@
-          endif # !windows
-        endif # !macosx
-
-        ifeq ($(ZIP_DEBUGINFO_FILES), true)
-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
-          $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
-
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET)
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$($1_PROGRAM).map $$($1_PROGRAM).pdb
-          else
-            $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \
-                $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
-          endif
-endif # no MacOS X support yet
-        else
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
-                $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
-          else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-          endif
-        endif
-      endif
-    endif
-
-    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
-
-    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST)
-	$$(call LINKING_EXE_MSG,$$($1_BASENAME))
-	$$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \
-	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
-	$$($1_EXTRA_LDFLAGS_SUFFIX)
-        ifneq (,$$($1_GEN_MANIFEST))
-	  $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
-        endif
-        # This only works if the openjdk_codesign identity is present on the system. Let
-        # silently fail otherwise.
-        ifneq (,$(CODESIGN))
-          ifneq (,$$($1_CODESIGN))
-	    $(CODESIGN) -s openjdk_codesign $$@
-          endif
-        endif
-  endif
-endef
--- a/common/makefiles/RMICompilation.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-#
-# Copyright (c) 2011, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-define SetupRMICompilation
-  # param 1 is a name for a variable to depend on.
-  # param 2 and up are named args.
-  #   CLASSES:=List of classes to generate stubs for
-  #   CLASSES_DIR:=Directory where to look for classes
-  #   STUB_CLASSES_DIR:=Directory in where to put stub classes
-  #   RUN_V11:=Set to run rmic with -v1.1
-  #   RUN_V12:=Set to run rmic with -v1.2
-  #   RUN_IIOP:=Set to run rmic with -iiop
-  #   RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
-  #   KEEP_GENERATED:=Set to keep generated sources around
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
-
-  $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/_the.$1_rmic.generated
-
-  $1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
-  $1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))
-  $1_STUB_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Stub.class,$$($1_CLASSES_SLASH)))
-  $1_TARGETS := $$($1_STUB_FILES)
-  $1_ARGS :=
-  ifneq (,$$($1_RUN_V11))
-    $1_SKEL_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Skel.class,$$($1_CLASSES_SLASH)))
-    $1_TARGETS += $$($1_SKEL_FILES)
-    $1_ARGS += -v1.1
-  endif
-  ifneq (,$$($1_RUN_V12))
-    $1_ARGS += -v1.2
-  endif
-
-  $1_TIE_BASE_FILES := $$(foreach f,$$($1_CLASSES_SLASH),$$(dir $$f)_$$(notdir $$f))
-  $1_TIE_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/org/omg/stub/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
-  $1_TIE_STDPKG_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
-
-  ifneq (,$$($1_RUN_IIOP))
-    $1_TARGETS += $$($1_TIE_FILES)
-    $1_ARGS += -iiop -emitPermissionCheck
-  endif
-  ifneq (,$$($1_RUN_IIOP_STDPKG))
-    $1_TARGETS += $$($1_TIE_STDPKG_FILES)
-    $1_ARGS2 := -iiop -emitPermissionCheck -standardPackage
-  endif
-
-  ifneq (,$$($1_KEEP_GENERATED))
-    $1_ARGS += -keepgenerated
-    $1_TARGETS += $$(subst .class,.java,$$($1_TARGETS))
-  endif
-
-  $1_DOLLAR_SAFE_CLASSES := $$(subst $$$$,\$$$$,$$($1_CLASSES))
-
-  $$($1_TARGETS): $$($1_DEP_FILE) $$($1_CLASS_FILES)
-
-  $$($1_DEP_FILE): $$($1_CLASS_FILES)
-	$(MKDIR) -p $$($1_STUB_CLASSES_DIR)
-	if [ "x$$($1_ARGS)" != "x" ]; then \
-	  $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) && \
-	  $(RMIC) $$($1_ARGS) -classpath "$$($1_CLASSES_DIR)" \
-	      -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
-	fi;
-	if [ "x$$($1_ARGS2)" != "x" ]; then \
-	  $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) && \
-	  $(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
-	      -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
-	fi;
-	$(TOUCH) $$@
-
-
-  $1 := $$($1_TARGETS) $$($1_DEP_FILE)
-
-endef
--- a/common/makefiles/devkit/Makefile	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-#
-# Copyright (c) 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-##########################################################################################
-#
-# This Makefile, together with Tools.gmk, can be used to compile a set of
-# gcc based cross compilation, portable, self contained packages, capable
-# of building OpenJDK.
-#
-# In addition to the makefiles, access to Oracle Linux installation
-# media is required. This has been tested against Oracle Enterprise Linux
-# 5.5. Set variables RPM_DIR_x86_64 and RPM_DIR_i686 respectively to point
-# to directory containing the RPMs.
-#
-# By default this Makefile will build crosstools for:
-# * i686-unknown-linux-gnu
-# * x86_64-unknown-linux-gnu
-# The x86_64 version of the compilers will work in multi arch mode and will
-# be able to compile 32bit binaries with the -m32 flag. This makes the
-# explicit cross compiler for i686 somewhat redundant and is a known issue.
-#
-# To build the full set of crosstools, use a command line looking like this:
-#
-# make tars RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
-#
-# To create a x86_64 package without the redundant i686 cross compiler, do
-# like this:
-#
-# make tars platforms=x86_64-unknown-linux-gnu RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
-
-#
-# Main makefile which iterates over all host and target platforms.
-#
-
-os := $(shell uname -o)
-cpu := x86_64
-#$(shell uname -p)
-
-#
-# This wrapper script can handle exactly these platforms
-#
-platforms := $(foreach p,x86_64 i686,$(p)-unknown-linux-gnu)
-#platforms := $(foreach p,x86_64,$(p)-unknown-linux-gnu)
-
-# Figure out what platform this is building on.
-me := $(cpu)-$(if $(findstring Linux,$(os)),unknown-linux-gnu)
-
-$(info Building on platform $(me))
-
-all compile : $(platforms)
-
-ifeq (,$(SKIP_ME))
-  $(foreach p,$(filter-out $(me),$(platforms)),$(eval $(p) : $$(me)))
-endif
-
-OUTPUT_ROOT = $(abspath ../../../build/devkit)
-RESULT = $(OUTPUT_ROOT)/result
-
-submakevars = HOST=$@ BUILD=$(me) \
-    RESULT=$(RESULT) PREFIX=$(RESULT)/$@ \
-    OUTPUT_ROOT=$(OUTPUT_ROOT)
-$(platforms) :
-	@echo 'Building compilers for $@'
-	@echo 'Targets: $(platforms)'
-	for p in $@ $(filter-out $@,$(platforms)); do \
-	  $(MAKE) -f Tools.gmk all $(submakevars) \
-	      TARGET=$$p || exit 1 ; \
-	done
-	@echo 'Building ccache program for $@'
-	$(MAKE) -f Tools.gmk ccache $(submakevars) TARGET=$@
-	@echo 'All done"'
-
-$(foreach a,i686 x86_64,$(eval $(a) : $(filter $(a)%,$(platforms))))
-
-ia32 : i686
-today := $(shell date +%Y%m%d)
-
-
-define Mktar
-  $(1)_tar = $$(RESULT)/sdk-$(1)-$$(today).tar.gz
-  $$($(1)_tar) : PLATFORM = $(1)
-  TARFILES += $$($(1)_tar)
-  $$($(1)_tar) : $(1) $$(shell find $$(RESULT)/$(1))
-endef
-
-$(foreach p,$(platforms),$(eval $(call Mktar,$(p))))
-
-tars : all $(TARFILES)
-onlytars : $(TARFILES)
-%.tar.gz :
-	@echo 'Creating compiler package $@'
-	cd $(RESULT)/$(PLATFORM) && tar -czf $@ *
-	touch $@
-
-clean :
-	rm -rf build result
-
-FORCE :
-.PHONY : $(configs) $(platforms)
--- a/common/makefiles/devkit/Tools.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,473 +0,0 @@
-#
-# Copyright (c) 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-##########################################################################################
-#
-# Workhorse makefile for creating ONE cross compiler
-# Needs either to be from BUILD -> BUILD OR have
-# BUILD -> HOST prebuilt
-#
-# NOTE: There is a bug here. We don't limit the
-# PATH when building BUILD -> BUILD, which means that
-# if you configure after you've once build the BUILD->BUILD
-# compiler THAT one will be picked up as the compiler for itself.
-# This is not so great, especially if you did a partial delete
-# of the target tree.
-#
-# Fix this...
-#
-
-$(info TARGET=$(TARGET))
-$(info HOST=$(HOST))
-$(info BUILD=$(BUILD))
-
-ARCH := $(word 1,$(subst -, ,$(TARGET)))
-
-##########################################################################################
-# Define external dependencies
-
-# Latest that could be made to work.
-gcc_ver := gcc-4.7.3
-binutils_ver := binutils-2.22
-ccache_ver := ccache-3.1.9
-mpfr_ver := mpfr-3.0.1
-gmp_ver := gmp-4.3.2
-mpc_ver := mpc-1.0.1
-
-GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.bz2
-BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.bz2
-CCACHE := http://samba.org/ftp/ccache/$(ccache_ver).tar.gz
-MPFR := http://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
-GMP := http://ftp.gnu.org/pub/gnu/gmp/${gmp_ver}.tar.bz2
-MPC := http://www.multiprecision.org/mpc/download/${mpc_ver}.tar.gz
-
-# RPMs in OEL5.5
-RPM_LIST := \
-    kernel-headers \
-    glibc-2 glibc-headers glibc-devel \
-    cups-libs cups-devel \
-    libX11 libX11-devel \
-    xorg-x11-proto-devel \
-    alsa-lib alsa-lib-devel \
-    libXext libXext-devel \
-    libXtst libXtst-devel \
-    libXrender libXrender-devel \
-    freetype freetype-devel \
-    libXt libXt-devel \
-    libSM libSM-devel \
-    libICE libICE-devel \
-    libXi libXi-devel \
-    libXdmcp libXdmcp-devel \
-    libXau libXau-devel \
-    libgcc
-
-
-ifeq ($(ARCH),x86_64)
-  RPM_DIR ?= $(RPM_DIR_x86_64)
-  RPM_ARCHS := x86_64
-  ifeq ($(BUILD),$(HOST))
-    ifeq ($(TARGET),$(HOST))
-      # When building the native compiler for x86_64, enable mixed mode.
-      RPM_ARCHS += i386 i686
-    endif
-  endif
-else
-  RPM_DIR ?= $(RPM_DIR_i686)
-  RPM_ARCHS := i386 i686
-endif
-
-# Sort to remove duplicates
-RPM_FILE_LIST := $(sort $(foreach a,$(RPM_ARCHS),$(wildcard $(patsubst %,$(RPM_DIR)/%*$a.rpm,$(RPM_LIST)))))
-
-ifeq ($(RPM_FILE_LIST),)
-  $(error Found no RPMs, RPM_DIR must point to list of directories to search for RPMs)
-endif
-
-##########################################################################################
-# Define common directories and files
-
-# Ensure we have 32-bit libs also for x64. We enable mixed-mode.
-ifeq (x86_64,$(ARCH))
-  LIBDIRS := lib64 lib
-  CFLAGS_lib := -m32
-else
-  LIBDIRS := lib
-endif
-
-# Define directories
-RESULT := $(OUTPUT_ROOT)/result
-BUILDDIR := $(OUTPUT_ROOT)/$(HOST)/$(TARGET)
-PREFIX := $(RESULT)/$(HOST)
-TARGETDIR := $(PREFIX)/$(TARGET)
-SYSROOT := $(TARGETDIR)/sys-root
-DOWNLOAD := $(OUTPUT_ROOT)/download
-SRCDIR := $(OUTPUT_ROOT)/src
-
-# Marker file for unpacking rpms
-rpms := $(SYSROOT)/rpms_unpacked
-
-# Need to patch libs that are linker scripts to use non-absolute paths
-libs := $(SYSROOT)/libs_patched
-
-##########################################################################################
-# Unpack source packages
-
-# Generate downloading + unpacking of sources.
-define Download
-  $(1)_DIR = $(abspath $(SRCDIR)/$(basename $(basename $(notdir $($(1))))))
-  $(1)_CFG = $$($(1)_DIR)/configure
-  $(1)_FILE = $(DOWNLOAD)/$(notdir $($(1)))
-
-  $$($(1)_CFG) : $$($(1)_FILE)
-	mkdir -p $$(SRCDIR)
-	tar -C $$(SRCDIR) -x$$(if $$(findstring .gz, $$<),z,j)f $$<
-	$$(foreach p,$$(abspath $$(wildcard $$(notdir $$($(1)_DIR)).patch)), \
-	  echo PATCHING $$(p) ; \
-	  patch -d $$($(1)_DIR) -p1 -i $$(p) ; \
-	)
-	touch $$@
-
-  $$($(1)_FILE) :
-	wget -P $(DOWNLOAD) $$($(1))
-endef
-
-# Download and unpack all source packages
-$(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC,$(eval $(call Download,$(p))))
-
-##########################################################################################
-# Unpack RPMS
-
-# Note. For building linux you should install rpm2cpio.
-define unrpm
-  $(SYSROOT)/$(notdir $(1)).unpacked \
-    : $(1)
-  $$(rpms) : $(SYSROOT)/$(notdir $(1)).unpacked
-endef
-
-%.unpacked :
-	$(info Unpacking target rpms and libraries from $<)
-	@(mkdir -p $(@D); \
-	cd $(@D); \
-	rpm2cpio $< | \
-	    cpio --extract --make-directories \
-	        -f \
-	        "./usr/share/doc/*" \
-	        "./usr/share/man/*" \
-	        "./usr/X11R6/man/*" \
-	        "*/X11/locale/*" \
-	    || die ; )
-	touch $@
-
-$(foreach p,$(RPM_FILE_LIST),$(eval $(call unrpm,$(p))))
-
-##########################################################################################
-
-# Note: MUST create a <sys-root>/usr/lib even if not really needed.
-# gcc will use a path relative to it to resolve lib64. (x86_64).
-# we're creating multi-lib compiler with 32bit libc as well, so we should
-# have it anyway, but just to make sure...
-# Patch libc.so and libpthread.so to force linking against libraries in sysroot
-# and not the ones installed on the build machine.
-$(libs) : $(rpms)
-	@echo Patching libc and pthreads
-	@(for f in `find $(SYSROOT) -name libc.so -o -name libpthread.so`; do \
-	  (cat $$f | sed -e 's|/usr/lib64/||g' \
-	      -e 's|/usr/lib/||g' \
-	      -e 's|/lib64/||g' \
-	      -e 's|/lib/||g' ) > $$f.tmp ; \
-	  mv $$f.tmp $$f ; \
-	done)
-	@mkdir -p $(SYSROOT)/usr/lib
-	@touch $@
-
-##########################################################################################
-
-# Define marker files for each source package to be compiled
-$(foreach t,binutils mpfr gmp mpc gcc ccache,$(eval $(t) = $(TARGETDIR)/$($(t)_ver).done))
-
-##########################################################################################
-
-# Default base config
-CONFIG = --target=$(TARGET) \
-    --host=$(HOST) --build=$(BUILD) \
-    --prefix=$(PREFIX)
-
-PATHEXT = $(RESULT)/$(BUILD)/bin:
-
-PATHPRE = PATH=$(PATHEXT)$(PATH)
-BUILDPAR = -j16
-
-# Default commands to when making
-MAKECMD =
-INSTALLCMD = install
-
-
-declare_tools = CC$(1)=$(2)gcc LD$(1)=$(2)ld AR$(1)=$(2)ar AS$(1)=$(2)as RANLIB$(1)=$(2)ranlib CXX$(1)=$(2)g++ OBJDUMP$(1)=$(2)objdump
-
-ifeq ($(HOST),$(BUILD))
-  ifeq ($(HOST),$(TARGET))
-    TOOLS = $(call declare_tools,_FOR_TARGET,)
-  endif
-endif
-
-TOOLS ?= $(call declare_tools,_FOR_TARGET,$(TARGET)-)
-
-##########################################################################################
-
-# Create a TARGET bfd + libiberty only.
-# Configure one or two times depending on mulitlib arch.
-# If multilib, the second should be 32-bit, and we resolve
-# CFLAG_<name> to most likely -m32.
-define mk_bfd
-  $$(info Libs for $(1))
-  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
-      : CFLAGS += $$(CFLAGS_$(1))
-  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
-      : LIBDIRS = --libdir=$(TARGETDIR)/$(1)
-
-  bfdlib += $$(TARGETDIR)/$$(binutils_ver)-$(subst /,-,$(1)).done
-  bfdmakes += $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile
-endef
-
-# Create one set of bfds etc for each multilib arch
-$(foreach l,$(LIBDIRS),$(eval $(call mk_bfd,$(l))))
-
-# Only build these two libs.
-$(bfdlib) : MAKECMD = all-libiberty all-bfd
-$(bfdlib) : INSTALLCMD = install-libiberty install-bfd
-
-# Building targets libbfd + libiberty. HOST==TARGET, i.e not
-# for a cross env.
-$(bfdmakes) : CONFIG = --target=$(TARGET) \
-    --host=$(TARGET) --build=$(BUILD) \
-    --prefix=$(TARGETDIR) \
-    --with-sysroot=$(SYSROOT) \
-    $(LIBDIRS)
-
-$(bfdmakes) : TOOLS = $(call declare_tools,_FOR_TARGET,$(TARGET)-) $(call declare_tools,,$(TARGET)-)
-
-##########################################################################################
-
-$(gcc) \
-    $(binutils) \
-    $(gmp) \
-    $(mpfr) \
-    $(mpc) \
-    $(bfdmakes) \
-    $(ccache) : ENVS += $(TOOLS)
-
-# libdir to work around hateful bfd stuff installing into wrong dirs...
-# ensure we have 64 bit bfd support in the HOST library. I.e our
-# compiler on i686 will know 64 bit symbols, BUT later
-# we build just the libs again for TARGET, then with whatever the arch
-# wants.
-$(BUILDDIR)/$(binutils_ver)/Makefile : CONFIG += --enable-64-bit-bfd --libdir=$(PREFIX)/$(word 1,$(LIBDIRS))
-
-# Makefile creation. Simply run configure in build dir.
-$(bfdmakes) \
-$(BUILDDIR)/$(binutils_ver)/Makefile \
-    : $(BINUTILS_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(BINUTILS_CFG) \
-	      $(CONFIG) \
-	      --with-sysroot=$(SYSROOT) \
-	      --disable-nls \
-	      --program-prefix=$(TARGET)- \
-	      --enable-multilib \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-$(BUILDDIR)/$(mpfr_ver)/Makefile \
-    : $(MPFR_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(MPFR_CFG) \
-	      $(CONFIG) \
-	      --program-prefix=$(TARGET)- \
-	      --enable-shared=no \
-	      --with-gmp=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-$(BUILDDIR)/$(gmp_ver)/Makefile \
-    : $(GMP_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(GMP_CFG) \
-	      --host=$(HOST) --build=$(BUILD) \
-	      --prefix=$(PREFIX) \
-	      --disable-nls \
-	      --program-prefix=$(TARGET)- \
-	      --enable-shared=no \
-	      --with-mpfr=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-$(BUILDDIR)/$(mpc_ver)/Makefile \
-    : $(MPC_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(MPC_CFG) \
-	      $(CONFIG) \
-	      --program-prefix=$(TARGET)- \
-	      --enable-shared=no \
-	      --with-mpfr=$(PREFIX) \
-	      --with-gmp=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-# Only valid if glibc target -> linux
-# proper destructor handling for c++
-ifneq (,$(findstring linux,$(TARGET)))
-  $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG += --enable-__cxa_atexit
-endif
-
-# Want:
-# c,c++
-# shared libs
-# multilib (-m32/-m64 on x64)
-# skip native language.
-# and link and assemble with the binutils we created
-# earlier, so --with-gnu*
-$(BUILDDIR)/$(gcc_ver)/Makefile \
-    : $(GCC_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) $(GCC_CFG) $(EXTRA_CFLAGS) \
-	      $(CONFIG) \
-	      --with-sysroot=$(SYSROOT) \
-	      --enable-languages=c,c++ \
-	      --enable-shared \
-	      --enable-multilib \
-	      --disable-nls \
-	      --with-gnu-as \
-	      --with-gnu-ld \
-	      --with-mpfr=$(PREFIX) \
-	      --with-gmp=$(PREFIX) \
-	      --with-mpc=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-# need binutils for gcc
-$(gcc) : $(binutils)
-
-# as of 4.3 or so need these for doing config
-$(BUILDDIR)/$(gcc_ver)/Makefile : $(gmp) $(mpfr) $(mpc)
-$(mpfr) : $(gmp)
-$(mpc) : $(gmp) $(mpfr)
-
-##########################################################################################
-# very straightforward. just build a ccache. it is only for host.
-$(BUILDDIR)/$(ccache_ver)/Makefile \
-    : $(CCACHE_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	@( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) $(CCACHE_CFG) \
-	      $(CONFIG) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-gccpatch = $(TARGETDIR)/gcc-patched
-
-##########################################################################################
-# For some reason cpp is not created as a target-compiler
-ifeq ($(HOST),$(TARGET))
-  $(gccpatch) : $(gcc) link_libs
-	@echo -n 'Creating compiler symlinks...'
-	@for f in cpp; do \
-	  if [ ! -e $(PREFIX)/bin/$(TARGET)-$$f ]; \
-	  then \
-	    cd $(PREFIX)/bin && \
-	    ln -s $$f $(TARGET)-$$f ; \
-	  fi \
-	done
-	@touch $@
-	@echo 'done'
-
-  ##########################################################################################
-  # Ugly at best. Seems that when we compile host->host compiler, that are NOT
-  # the BUILD compiler, the result will not try searching for libs in package root.
-  # "Solve" this by create links from the target libdirs to where they are.
-  link_libs:
-	@echo -n 'Creating library symlinks...'
-	@$(foreach l,$(LIBDIRS), \
-	for f in `cd $(PREFIX)/$(l) && ls`; do \
-	  if [ ! -e $(TARGETDIR)/$(l)/$$f ]; then \
-	    mkdir -p $(TARGETDIR)/$(l) && \
-	    cd $(TARGETDIR)/$(l)/ && \
-	    ln -s $(if $(findstring /,$(l)),../,)../../$(l)/$$f $$f; \
-	  fi \
-	done;)
-	@echo 'done'
-else
-  $(gccpatch) :
-	@echo 'done'
-endif
-
-##########################################################################################
-# Build in two steps.
-# make <default>
-# make install.
-# Use path to our build hosts cross tools
-# Always need to build cross tools for build host self.
-$(TARGETDIR)/%.done : $(BUILDDIR)/%/Makefile
-	$(info Building $(basename $@). Log in $(<D)/log.build)
-	$(PATHPRE) $(ENVS) $(MAKE) $(BUILDPAR) -f $< -C $(<D) $(MAKECMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.build 2>&1
-	@echo -n 'installing...'
-	$(PATHPRE) $(MAKE) $(INSTALLPAR) -f $< -C $(<D) $(INSTALLCMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.install 2>&1
-	@touch $@
-	@echo 'done'
-
-##########################################################################################
-
-bfdlib : $(bfdlib)
-binutils : $(binutils)
-rpms : $(rpms)
-libs : $(libs)
-sysroot : rpms libs
-gcc : sysroot $(gcc) $(gccpatch)
-all : binutils gcc bfdlib
-
-# this is only built for host. so separate.
-ccache : $(ccache)
-
-.PHONY : gcc all binutils bfdlib link_libs rpms libs sysroot
--- a/common/makefiles/javadoc/CORE_PKGS.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,300 +0,0 @@
-#
-# Copyright (c) 2001, 2011, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# EXCLUDE_PKGS is the list of packages to exclude from the
-# Java API Specification. Do not add these to CORE_PKGS.
-# The concatenation of EXCLUDE_PKGS and CORE_PKGS
-# should make up the list of all packages under the
-# src/shared/classes directory of the JDK source tree.
-#
-EXCLUDE_PKGS = \
-    java.awt.peer \
-    java.awt.dnd.peer \
-    sun.* \
-    com.sun.* \
-    org.apache.* \
-    org.jcp.* \
-    org.w3c.dom.css \
-    org.w3c.dom.html \
-    org.w3c.dom.stylesheets \
-    org.w3c.dom.traversal \
-    org.w3c.dom.ranges \
-    org.omg.stub.javax.management.remote.rmi
-
-#
-# ACTIVE_JSR_PKGS are packages that are part of an active JSR process--
-# one that is doing its own review. These packages are not included when
-# creating diff pages for the platform's JCP process.
-#
-# (see /java/pubs/apisrc/jdk/6.0/beta/make/docs/active_jsr_pkgs)
-# Note:
-# This is a list of regular expressions. So foo.* matches "foo" and "foo.bar".
-#
-ACTIVE_JSR_PKGS= \
-    java.lang.invoke \
-    java.sql \
-    javax.activation \
-    javax.annotation.* \
-    javax.jws.* \
-    javax.lang.* \
-    javax.management.* \
-    javax.script \
-    javax.sql.* \
-    javax.tools.* \
-    javax.xml.* \
-    org.w3c.* \
-    org.xml.sax
-
-#
-# CORE_PKGS is the list of packages that form the
-# Java API Specification.
-#
-### ***IMPORTANT NOTE***
-### There is also a "REGEXP" variable in the docs/makefile that
-### determines which table the packages go in on the main page.
-### Currently, there is only table ("Platform Packages") and
-### everything goes in it, so REGEXP is "*". But if that policy
-### changes, packages added will need to be reflected in that
-### list of wildcard expressions, as well.
-###
-CORE_PKGS = \
-    java.applet \
-    java.awt \
-    java.awt.color \
-    java.awt.datatransfer \
-    java.awt.dnd \
-    java.awt.event \
-    java.awt.font \
-    java.awt.geom \
-    java.awt.im \
-    java.awt.im.spi \
-    java.awt.image \
-    java.awt.image.renderable \
-    java.awt.print \
-    java.beans \
-    java.beans.beancontext \
-    java.io \
-    java.lang \
-    java.lang.annotation \
-    java.lang.instrument \
-    java.lang.invoke \
-    java.lang.management \
-    java.lang.ref \
-    java.lang.reflect \
-    java.math \
-    java.net \
-    java.nio \
-    java.nio.channels \
-    java.nio.channels.spi \
-    java.nio.charset \
-    java.nio.charset.spi \
-    java.nio.file \
-    java.nio.file.attribute \
-    java.nio.file.spi \
-    java.rmi \
-    java.rmi.activation \
-    java.rmi.dgc \
-    java.rmi.registry \
-    java.rmi.server \
-    java.security \
-    java.security.acl \
-    java.security.cert \
-    java.security.interfaces \
-    java.security.spec \
-    java.sql \
-    java.text \
-    java.text.spi \
-    java.time \
-    java.time.chrono \
-    java.time.format \
-    java.time.temporal \
-    java.time.zone \
-    java.util \
-    java.util.concurrent \
-    java.util.concurrent.atomic \
-    java.util.concurrent.locks \
-    java.util.function \
-    java.util.jar \
-    java.util.logging \
-    java.util.prefs \
-    java.util.regex \
-    java.util.spi \
-    java.util.stream \
-    java.util.zip \
-    javax.accessibility \
-    javax.activation \
-    javax.activity \
-    javax.annotation \
-    javax.annotation.processing \
-    javax.crypto \
-    javax.crypto.interfaces \
-    javax.crypto.spec \
-    javax.imageio \
-    javax.imageio.event \
-    javax.imageio.metadata \
-    javax.imageio.plugins.jpeg \
-    javax.imageio.plugins.bmp \
-    javax.imageio.spi \
-    javax.imageio.stream \
-    javax.jws \
-    javax.jws.soap \
-    javax.lang.model \
-    javax.lang.model.element \
-    javax.lang.model.type \
-    javax.lang.model.util \
-    javax.management \
-    javax.management.loading \
-    javax.management.monitor \
-    javax.management.relation \
-    javax.management.openmbean \
-    javax.management.timer \
-    javax.management.modelmbean \
-    javax.management.remote \
-    javax.management.remote.rmi \
-    javax.naming \
-    javax.naming.directory \
-    javax.naming.event \
-    javax.naming.ldap \
-    javax.naming.spi \
-    javax.net \
-    javax.net.ssl \
-    javax.print \
-    javax.print.attribute \
-    javax.print.attribute.standard \
-    javax.print.event \
-    javax.rmi \
-    javax.rmi.CORBA \
-    javax.rmi.ssl \
-    javax.script \
-    javax.security.auth \
-    javax.security.auth.callback \
-    javax.security.auth.kerberos \
-    javax.security.auth.login \
-    javax.security.auth.spi \
-    javax.security.auth.x500 \
-    javax.security.cert \
-    javax.security.sasl \
-    javax.sound.sampled \
-    javax.sound.sampled.spi \
-    javax.sound.midi \
-    javax.sound.midi.spi \
-    javax.sql \
-    javax.sql.rowset \
-    javax.sql.rowset.serial \
-    javax.sql.rowset.spi \
-    javax.swing \
-    javax.swing.border \
-    javax.swing.colorchooser \
-    javax.swing.filechooser \
-    javax.swing.event \
-    javax.swing.table \
-    javax.swing.text \
-    javax.swing.text.html \
-    javax.swing.text.html.parser \
-    javax.swing.text.rtf \
-    javax.swing.tree \
-    javax.swing.undo \
-    javax.swing.plaf \
-    javax.swing.plaf.basic \
-    javax.swing.plaf.metal \
-    javax.swing.plaf.multi \
-    javax.swing.plaf.nimbus \
-    javax.swing.plaf.synth \
-    javax.tools \
-    javax.tools.annotation \
-    javax.transaction \
-    javax.transaction.xa \
-    javax.xml.parsers \
-    javax.xml.bind \
-    javax.xml.bind.annotation \
-    javax.xml.bind.annotation.adapters \
-    javax.xml.bind.attachment \
-    javax.xml.bind.helpers \
-    javax.xml.bind.util \
-    javax.xml.soap \
-    javax.xml.ws \
-    javax.xml.ws.handler \
-    javax.xml.ws.handler.soap \
-    javax.xml.ws.http \
-    javax.xml.ws.soap \
-    javax.xml.ws.spi \
-    javax.xml.ws.spi.http \
-    javax.xml.ws.wsaddressing \
-    javax.xml.transform \
-    javax.xml.transform.sax \
-    javax.xml.transform.dom \
-    javax.xml.transform.stax \
-    javax.xml.transform.stream \
-    javax.xml \
-    javax.xml.crypto \
-    javax.xml.crypto.dom \
-    javax.xml.crypto.dsig \
-    javax.xml.crypto.dsig.dom \
-    javax.xml.crypto.dsig.keyinfo \
-    javax.xml.crypto.dsig.spec \
-    javax.xml.datatype \
-    javax.xml.validation \
-    javax.xml.namespace \
-    javax.xml.xpath \
-    javax.xml.stream \
-    javax.xml.stream.events \
-    javax.xml.stream.util \
-    org.ietf.jgss \
-    org.omg.CORBA \
-    org.omg.CORBA.DynAnyPackage \
-    org.omg.CORBA.ORBPackage \
-    org.omg.CORBA.TypeCodePackage \
-    org.omg.stub.java.rmi \
-    org.omg.CORBA.portable \
-    org.omg.CORBA_2_3 \
-    org.omg.CORBA_2_3.portable \
-    org.omg.CosNaming \
-    org.omg.CosNaming.NamingContextExtPackage \
-    org.omg.CosNaming.NamingContextPackage \
-    org.omg.SendingContext \
-    org.omg.PortableServer \
-    org.omg.PortableServer.CurrentPackage \
-    org.omg.PortableServer.POAPackage \
-    org.omg.PortableServer.POAManagerPackage \
-    org.omg.PortableServer.ServantLocatorPackage \
-    org.omg.PortableServer.portable \
-    org.omg.PortableInterceptor \
-    org.omg.PortableInterceptor.ORBInitInfoPackage \
-    org.omg.Messaging \
-    org.omg.IOP \
-    org.omg.IOP.CodecFactoryPackage \
-    org.omg.IOP.CodecPackage \
-    org.omg.Dynamic \
-    org.omg.DynamicAny \
-    org.omg.DynamicAny.DynAnyPackage \
-    org.omg.DynamicAny.DynAnyFactoryPackage \
-    org.w3c.dom \
-    org.w3c.dom.events \
-    org.w3c.dom.bootstrap \
-    org.w3c.dom.ls \
-    org.w3c.dom.views \
-    org.xml.sax \
-    org.xml.sax.ext \
-    org.xml.sax.helpers
--- a/common/makefiles/javadoc/Javadoc.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1188 +0,0 @@
-# Copyright (c) 1997, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include $(SPEC)
-include MakeBase.gmk
-
-.SUFFIXES: # Delete the default suffixes
-.SUFFIXES: .java
-
-#
-# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
-#
-
-DOCSDIR=$(OUTPUT_ROOT)/docs
-TEMPDIR=$(OUTPUT_ROOT)/docstemp
-
-JDK_SHARE_SRC=$(JDK_TOPDIR)/src/share
-JDK_SHARE_CLASSES=$(JDK_SHARE_SRC)/classes
-
-JDK_IMPSRC = $(JDK_OUTPUTDIR)/impsrc
-
-JDK_GENSRC = $(JDK_OUTPUTDIR)/gensrc
-
-HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
-
-BUILD_NUMBER=$(JDK_BUILD_NUMBER)
-
-JAVADOC_CMD = $(JAVA) \
-    -Xmx1024m \
-    -Djava.awt.headless=true \
-    $(NEW_JAVADOC) \
-    -bootclasspath $(JDK_OUTPUTDIR)/classes
-
-# Copyright year for beginning of Java and some of the apis
-# (Needed when creating the javadocs)
-FIRST_COPYRIGHT_YEAR = 1993
-DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
-MIRROR_FIRST_COPYRIGHT_YEAR = 2004
-DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
-TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
-JDI_FIRST_COPYRIGHT_YEAR = 1999
-JAAS_FIRST_COPYRIGHT_YEAR = 1998
-JGSS_FIRST_COPYRIGHT_YEAR = 2000
-SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
-HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
-MGMT_FIRST_COPYRIGHT_YEAR = 2003
-ATTACH_FIRST_COPYRIGHT_YEAR = 2005
-JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
-SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
-TRACING_FIRST_COPYRIGHT_YEAR = 2008
-TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
-JNLP_FIRST_COPYRIGHT_YEAR = 1998
-PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
-
-# Oracle name
-FULL_COMPANY_NAME = Oracle and/or its affiliates
-
-# Copyright address
-COMPANY_ADDRESS = 500 Oracle Parkway<br>Redwood Shores, CA 94065 USA.
-
-# The trademark symbol
-TRADEMARK = &trade;
-
-# Common copyright lines used
-# The word "Copyright" might optionally be a link to the file cpyr.html.
-# The first year of copyright may vary or not be available.
-# The address to the company might be optional.
-COMMA:= ,
-EMPTY:=
-SPACE:=$(EMPTY) $(EMPTY)
-COPYRIGHT_SYMBOL = &\#x00a9;
-# Macro to construct the copyright line
-# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
-define CopyrightLine # optionalurl optionalfirstyear optionaladdress
-$(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
-$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
-$(FULL_COMPANY_NAME). $3 All rights reserved.
-endef
-
-# Url to root of documents
-DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
-
-# Url to copyright html file
-COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
-# This isn't added in old build yet.
-#COPYRIGHT_URL-8 = $(DOCSDIR_URL)/legal/cpyr.html
-COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
-
-# Url to bug filing site
-BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
-
-# Common line for how to submit a bug or rfe
-BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
-
-# Url to devdocs page
-# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
-DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
-DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
-DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
-DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
-
-# Common Java trademark line
-JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
-$(FULL_COMPANY_NAME) in the US and other countries.
-
-#################################################################
-# Macros:
-
-
-# List of all possible directories for javadoc to look for sources
-# NOTE: Quotes are required around sourcepath argument only on Windows.
-# Otherwise, you get "No packages or classes specified." due
-# to $(PATH_SEP) being interpreted as an end of
-# command (newline or shell ; character)
-ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
-    $(JDK_IMPSRC) \
-    $(JDK_GENSRC) \
-    $(JDK_OUTPUTDIR)/gendocsrc_rmic \
-    $(JDK_TOPDIR)/src/solaris/classes \
-    $(JDK_TOPDIR)/src/windows/classes \
-    $(JDK_SHARE_SRC)/doc/stub
-
-# List of directories that actually exist
-ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
-
-# List with classpath separator between them
-EMPTY:=
-SPACE:= $(EMPTY) $(EMPTY)
-RELEASEDOCS_SOURCEPATH = \
-    $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
-
-define prep-target
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-endef
-
-# Prep for javadoc creation, assumes $@ is an index.html file
-define prep-javadoc
-	@if [ -f "$@" -a "$?" != "" ] ; then \
-	  $(ECHO) "# Dependencies have changed: $?"; \
-	fi
-	$(RM) -r $(@D)
-	$(MKDIR) -p $(@D)
-endef
-
-# A cache of the directories in ALL_SOURCE_DIRS
-DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
-
-# Given a list of packages, return a list of files or dirs to be dependent on
-# (Currently only returning a list of directories)
-define PackageDependencies # packages
-  $(shell \
-      if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
-        for p in $1 ; do \
-          pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
-          $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
-        done; \
-      fi \
-  )
-endef
-
-# Given a list of packages, add packages that exist to $@, print summary
-define PackageFilter # packages
-	@if [ "$1" != "" ] ; then \
-	  for p in $1 ; do \
-	    pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
-	    found="false"; \
-	    for cp in $(ALL_SOURCE_DIRS) ; do \
-	      if [ -d $${cp}/$${pd} ] ; then \
-	        $(ECHO) "$${p}" >> $@; \
-	        found="true"; \
-	        break; \
-	      fi; \
-	    done; \
-	    if [ "$${found}" = "false" ] ; then \
-	      $(ECHO) "WARNING: Package not found: $${p}"; \
-	    fi; \
-	  done; \
-	fi
-endef
-
-# Print out a summary of the javadoc command about to be run
-define JavadocSummary # optionsfile packagesfile
-	@$(ECHO) "# Summary for $@"; \
-	$(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@#   @' $1; \
-	$(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@#   @' $2
-endef
-
-#
-# Temporary directory for javadoc creation
-#
-DOCSTMPDIR = $(TEMPDIR)/doctmp
-
-#
-# Different api directories created from root directory
-#
-COREAPI_DOCSDIR = $(DOCSDIR)/api
-JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
-JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
-PLATFORM_DOCSDIR = $(DOCSDIR)/platform
-
-# The non-core api javadocs need to be able to access the root of the core
-# api directory, so for jdk/api or jre/api to get to the core api/
-# directory we would use this:
-JDKJRE2COREAPI = ../../api
-
-# Common bottom argument
-define CommonBottom # year
-<font size="-1"><br> $(call CopyrightLine,,$1,)</font>
-endef
-
-# Common trademark bottom argument (Not sure why this is used sometimes)
-define CommonTrademarkBottom # year
-<font size="-1">\
-$(BUG_SUBMIT_LINE)<br>$(JAVA_TRADEMARK_LINE)<br>\
-$(call CopyrightLine,,$1,$(COMPANY_ADDRESS))\
-</font>
-endef
-
-# Common echo of option
-define OptionOnly # opt
-	$(PRINTF) "%s\n" "$1"
-endef
-define OptionPair # opt arg
-	$(PRINTF) "%s '%s'\n" "$1" '$2'
-endef
-define OptionTrip # opt arg arg
-	$(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
-endef
-
-# Core api bottom argument (with special sauce)
-COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
-<br>For further API reference and developer documentation, \
-see <a href="$(DEV_DOCS_URL)" target="_blank">Java SE Documentation</a>. \
-That documentation contains more detailed, developer-targeted descriptions, \
-with conceptual overviews, definitions of terms, workarounds, \
-and working code examples.<br>\
-$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
-</font>
-
-# Common javadoc options used by all
-COMMON_JAVADOCFLAGS = \
-    -XDignore.symbol.file=true \
-    -quiet \
-    -use \
-    -keywords \
-    -Xdoclint:none \
-    -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
-    $(ADDITIONAL_JAVADOCFLAGS)
-
-ifdef OPENJDK
-  ADDITIONAL_JAVADOCFLAGS = \
-      -Xdocrootparent $(DOCS_BASE_URL)
-else
-  ADDITIONAL_JAVADOCFLAGS =
-endif
-
-# Draft used for non-fcs documents
-DRAFT_HEADER =
-ifneq ($(MILESTONE), fcs)
-  DRAFT_HEADER = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
-  DRAFT_BOTTOM = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
-  DRAFT_WINTITLE = $(BUILD_NUMBER)
-  # Early access top text (not used in FCS releases)
-  COREAPI_TOP_EARLYACCESS = \
-<div style="background-color: \#EEEEEE"> \
-<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
-margin-left: 6px; margin-right: 6px; text-align: justify; \
-font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
-font-weight: normal;"> \
-Please note that the specifications and other information \
-contained herein are not final and are subject to change. \
-The information is being made available to you solely for purpose of \
-evaluation. \
-</div> </div>
-
-endif
-
-#################################################################
-
-#
-# CORE_PKGS environment variable has been moved to the following file
-#
-include CORE_PKGS.gmk
-
-#
-# Load environment variables for API package names that are not part of
-# the Java SE platform
-#
-include NON_CORE_PKGS.gmk
-
-#################################################################
-
-#
-# Default target is same as docs target, create core api and all others it can
-#
-
-all: docs
-docs: coredocs otherdocs
-
-#################################################################
-# Production Targets -- USE THESE TARGETS WHEN:
-# a) You're generating docs outside of release engineering's
-#    standard control build.
-# b) The docs will be pushed to the web and/or included in
-#    the downloaded doc bundle.
-#
-# See: Notes.html#releaseTargets
-# Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
-#
-
-sanitycheckcoredocs:
-	@$(ECHO) ""
-	@$(ECHO) "Building core api docs with these values:"
-	@$(ECHO) "    BUILD_NUMBER = $(BUILD_NUMBER)"
-	@$(ECHO) "    MILESTONE = $(MILESTONE)"
-	@$(ECHO) ""
-        ifeq ($(BUILD_NUMBER), b00)
-	  @$(ECHO) "ERROR: Build number must be defined"
-	  @$(ECHO) "MILESTONE is set to $(MILESTONE)"
-	  @$(ECHO) ""
-	  exit 1
-        endif
-
-#############################################################
-#
-# coredocs
-#
-COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
-$(JDK_MINOR_VERSION)<br>API Specification
-COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
-COREAPI_HEADER = \
-<strong>Java$(TRADEMARK)&nbsp;Platform<br>Standard&nbsp;Ed.&nbsp;$(JDK_MINOR_VERSION)</strong>
-
-# Java language specification cite
-TAG_JLS = jls:a:See <cite> \
-The Java&trade; Language Specification</cite>:
-
-# Overview file for core apis
-COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
-
-# The index.html, options, and packages files
-COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
-COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
-COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
-
-coredocs: $(COREAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(COREAPI_INDEX_FILE): GET2DOCSDIR=..
-
-# Run javadoc if the index file is out of date or missing
-$(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
-	$(prep-javadoc)
-	$(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ISO-8859-1) ; \
-	  $(call OptionPair,-tag,beaninfo:X) ; \
-	  $(call OptionPair,-tag,revised:X) ; \
-	  $(call OptionPair,-tag,since.unbundled:X) ; \
-	  $(call OptionPair,-tag,spec:X) ; \
-	  $(call OptionPair,-tag,specdefault:X) ; \
-	  $(call OptionPair,-tag,Note:X) ; \
-	  $(call OptionPair,-tag,ToDo:X) ; \
-	  $(call OptionPair,-tag,apiNote:a:API Note:) ; \
-	  $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \
-	  $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \
-	  $(call OptionPair,-tag,param) ; \
-	  $(call OptionPair,-tag,return) ; \
-	  $(call OptionPair,-tag,throws) ; \
-	  $(call OptionPair,-tag,since) ; \
-	  $(call OptionPair,-tag,version) ; \
-	  $(call OptionPair,-tag,serialData) ; \
-	  $(call OptionPair,-tag,factory) ; \
-	  $(call OptionPair,-tag,see) ; \
-	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
-	  $(call OptionOnly,-splitIndex) ; \
-	  $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ; \
-	  $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	) >> $@
-        ifdef COREAPI_TOP_EARLYACCESS
-	  @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
-        endif
-
-# Create a file with the package names in it
-$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(CORE_PKGS))
-
-#############################################################
-#
-# docletapidocs
-#
-
-ALL_OTHER_TARGETS += docletapidocs
-
-DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
-DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOCLETAPI_DOCTITLE := Doclet API
-DOCLETAPI_WINDOWTITLE := Doclet API
-DOCLETAPI_HEADER := <strong>Doclet API</strong>
-DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
-DOCLETAPI_GROUPNAME := Packages
-DOCLETAPI_REGEXP := com.sun.javadoc
-# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
-DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
-DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
-
-docletapidocs: $(DOCLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOCLETAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-breakiterator) ; \
-	  $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
-	  $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(DOCLETAPI_PKGS))
-
-#############################################################
-#
-# tagletapidocs
-#
-
-ALL_OTHER_TARGETS += tagletapidocs
-TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
-TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
-# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
-
-# Temporary directory (special generation rules)
-TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
-
-# The index.html, options, and packages files
-TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
-TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
-TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
-
-tagletapidocs: $(TAGLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(RM) -r $(TAGLETAPI_TEMPDIR)
-	$(MKDIR) -p $(TAGLETAPI_TEMPDIR)
-	$(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
-	    @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
-	cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
-	cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
-	$(RM) -r $(TAGLETAPI_TEMPDIR)
-
-# Create file with javadoc options in it
-$(TAGLETAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nonavbar) ; \
-	  $(call OptionOnly,-noindex) ; \
-	  $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS))
-	$(prep-target)
-	@($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
-
-#############################################################
-#
-# domapidocs
-#
-
-ALL_OTHER_TARGETS += domapidocs
-
-DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
-DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOMAPI_DOCTITLE := Common DOM API
-DOMAPI_WINDOWTITLE := Common DOM API
-DOMAPI_HEADER := <strong>Common DOM API</strong>
-DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
-DOMAPI_GROUPNAME := Packages
-DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
-# DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
-DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
-DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
-
-domapidocs: $(DOMAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOMAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-splitIndex) ; \
-	  $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
-	  $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(DOMAPI_PKGS))
-
-#############################################################
-#
-# jpdadocs
-#
-
-ALL_OTHER_TARGETS += jpdadocs
-
-jpdadocs: jdidocs jdwpdocs jvmtidocs
-
-#############################################################
-#
-# jdidocs
-#
-
-ALL_OTHER_TARGETS += jdidocs
-
-JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
-JDI2COREAPI := ../../$(JDKJRE2COREAPI)
-JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
-JDI_WINDOWTITLE := Java Debug Interface
-JDI_HEADER := <strong>Java Debug Interface</strong>
-JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
-JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
-# JDI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
-JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
-JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
-
-jdidocs: $(JDI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JDI_PKGS))
-
-#############################################################
-#
-# jdwpdocs
-#
-
-ALL_OTHER_TARGETS += jdwpdocs
-
-JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
-
-jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
-$(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-	$(CP) $< $@
-
-#############################################################
-#
-# jvmtidocs
-#
-
-ALL_OTHER_TARGETS += jvmtidocs
-
-JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
-JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html
-
-jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
-$(JVMTI_DOCDIR)/jvmti.html:
-	@$(prep-javadoc)
-	@if [ -f $(JVMTI_HTML) ] ; then \
-	  $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
-	  $(CP) $(JVMTI_HTML) $@; \
-	else \
-	  $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
-	fi
-
-#############################################################
-#
-# jaasdocs
-#
-
-ALL_OTHER_TARGETS += jaasdocs
-
-JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
-JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
-JAAS_WINDOWTITLE := Java Authentication and Authorization Service
-JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
-JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
-# JAAS_PKGS is located in NON_CORE_PKGS.gmk
-JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
-
-# The index.html, options, and packages files
-JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
-JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
-JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
-
-jaasdocs: $(JAAS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JAAS_PKGS))
-
-#############################################################
-#
-# jgssdocs
-#
-
-ALL_OTHER_TARGETS += jgssdocs
-
-JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
-JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
-JGSS_WINDOWTITLE := Java GSS-API Utilities
-JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
-JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
-JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
-# JGSS_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
-JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
-JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
-
-jgssdocs: $(JGSS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JGSS_PKGS))
-
-#############################################################
-#
-# smartcardiodocs
-#
-
-ALL_OTHER_TARGETS += smartcardiodocs
-
-SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
-SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
-SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
-SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
-SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
-SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
-# SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
-SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
-SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
-
-smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
-
-# Set relative location to core api document root
-$(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SMARTCARDIO_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
-	  $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
-	  $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(SMARTCARDIO_PKGS))
-
-#############################################################
-#
-# httpserverdocs
-#
-
-ALL_OTHER_TARGETS += httpserverdocs
-
-HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
-HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
-HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
-HTTPSERVER_WINDOWTITLE := Java HTTP Server
-HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
-HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
-# HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
-
-HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
-HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
-HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
-
-httpserverdocs: $(HTTPSERVER_INDEX_HTML)
-
-# Set relative location to core api document root
-$(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(HTTPSERVER_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
-	  $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
-	  $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(HTTPSERVER_PKGS))
-
-#############################################################
-#
-# mgmtdocs
-#
-
-ALL_OTHER_TARGETS += mgmtdocs
-
-MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
-MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
-JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
-JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
-MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
-MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
-MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
-MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
-MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
-# MGMT_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
-MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
-MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
-
-mgmtdocs: $(MGMT_INDEX_FILE)
-
-# Set relative location to core api document root
-$(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	@if [ -f $(JVM_MIB_SRC) ] ; then \
-	  $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
-	  $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
-	else \
-	  $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
-	fi
-	$(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(MGMT_PKGS))
-
-#############################################################
-#
-# attachdocs
-#
-
-ALL_OTHER_TARGETS += attachdocs
-
-ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
-ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
-ATTACH_DOCTITLE := Attach API
-ATTACH_WINDOWTITLE := Attach API
-ATTACH_HEADER := <strong>Attach API</strong>
-ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
-# ATTACH_PKGS is located in NON_CORE_PKGS.gmk
-
-ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
-ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
-ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
-
-attachdocs: $(ATTACH_INDEX_HTML)
-
-# Set relative location to core api document root
-$(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(ATTACH_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(ATTACH_PKGS))
-
-#############################################################
-#
-# jconsoledocs
-#
-
-ALL_OTHER_TARGETS += jconsoledocs
-
-JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
-JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
-JCONSOLE_DOCTITLE := JConsole API
-JCONSOLE_WINDOWTITLE := JConsole API
-JCONSOLE_HEADER := <strong>JConsole API</strong>
-JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
-# JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
-
-JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
-JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
-JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
-
-jconsoledocs: $(JCONSOLE_INDEX_HTML)
-
-# Set relative location to core api document root
-$(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JCONSOLE_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JCONSOLE_PKGS))
-
-#############################################################
-#
-# treeapidocs
-#
-
-ALL_OTHER_TARGETS += treeapidocs
-
-TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
-TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TREEAPI_DOCTITLE := Compiler Tree API
-TREEAPI_WINDOWTITLE := Compiler Tree API
-TREEAPI_HEADER := <strong>Compiler Tree API</strong>
-TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
-TREEAPI_GROUPNAME := Packages
-TREEAPI_REGEXP := com.sun.source.*
-# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
-TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
-TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
-
-treeapidocs: $(TREEAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(TREEAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
-	  $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
-	  $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(TREEAPI_PKGS))
-
-#############################################################
-#
-# sctpdocs
-#
-
-ALL_OTHER_TARGETS += sctpdocs
-
-SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
-SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
-SCTPAPI_DOCTITLE := SCTP API
-SCTPAPI_WINDOWTITLE := SCTP API
-SCTPAPI_HEADER := <strong>SCTP API</strong>
-SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
-# SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
-SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
-SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
-
-sctpdocs: $(SCTPAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(SCTPAPI_INDEX_HTML): GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SCTPAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(SCTPAPI_PKGS))
-
-#############################################################
-#
-# Get a cache of all the directories
-
-$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
-	$(prep-target)
-	@for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
-	  $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
-	  $(FIND) $${cp} -type f >> $@; \
-	done
-
-#############################################################
-#release version of core packages ########
-# Maximize performance and ensure that build number & milestone are set.
-
-rel-coredocs: sanitycheckcoredocs
-	$(MAKE) coredocs
-
-rel-docs: rel-coredocs $(ALL_OTHER_TARGETS)
-#
-# end of production targets
-
-otherdocs: $(ALL_OTHER_TARGETS)
-
-clean:
-	$(RM) -r $(DOCSDIR) $(DOCSTMPDIR)
-
-#############################################################
-# DEBUG TARGET
-# List the values defined in the makefile hierarchy, to make sure everything
-# is set properly, and to help identify values we can use instead of making new ones.
-# (Most of them come from common/shared/Defs.gmk)
-#
-# Notes:
-# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
-# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
-#
-
-#############################################################
-.PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
-    sanitycheckcoredocs $(ALL_OTHER_TARGETS)
--- a/common/makefiles/javadoc/NON_CORE_PKGS.gmk	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-#
-# Copyright (c) 2002, 2012, 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.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# This file contains the package names of all the "non-core"
-# API published in the Java 2 SDK documentation. "Non-core" means
-# it includes all published API outside of the JDK API specification.
-#
-# These environment variables are used by javadoc in
-# make/docs/Makefile and are referenced by the localization
-# team when determining which APIs to extract javadoc
-# comments from.
-
-DOMAPI_PKGS = com.sun.java.browser.dom \
-    org.w3c.dom \
-    org.w3c.dom.bootstrap \
-    org.w3c.dom.ls \
-    org.w3c.dom.ranges \
-    org.w3c.dom.traversal \
-    org.w3c.dom.html \
-    org.w3c.dom.stylesheets \
-    org.w3c.dom.css \
-    org.w3c.dom.events \
-    org.w3c.dom.views
-
-JDI_PKGS = com.sun.jdi \
-    com.sun.jdi.event \
-    com.sun.jdi.request \
-    com.sun.jdi.connect \
-    com.sun.jdi.connect.spi
-
-MGMT_PKGS = com.sun.management
-
-JAAS_PKGS = com.sun.security.auth \
-    com.sun.security.auth.callback \
-    com.sun.security.auth.login \
-    com.sun.security.auth.module
-
-JGSS_PKGS = com.sun.security.jgss
-
-OLD_JSSE_PKGS = com.sun.net.ssl
-
-HTTPSERVER_PKGS = com.sun.net.httpserver \
-    com.sun.net.httpserver.spi
-
-NIO_PKGS = com.sun.nio.file
-
-DOCLETAPI_PKGS = com.sun.javadoc
-
-TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
-
-TAGLETAPI_PKGS = com.sun.tools.doclets
-
-ATTACH_PKGS = com.sun.tools.attach \
-    com.sun.tools.attach.spi
-
-JCONSOLE_PKGS = com.sun.tools.jconsole
-
-TREEAPI_PKGS = com.sun.source.doctree \
-    com.sun.source.tree \
-    com.sun.source.util \
-    jdk
-
-SMARTCARDIO_PKGS = javax.smartcardio
-
-SCTPAPI_PKGS = com.sun.nio.sctp
-
-ifeq ($(PLATFORM), macosx)
-  APPLE_EXT_PKGS = com.apple.concurrent \
-      com.apple.eawt \
-      com.apple.eawt.event \
-      com.apple.eio
-endif
-
-JDK_PKGS = jdk
-
-# non-core packages in rt.jar
-NON_CORE_PKGS = $(DOMAPI_PKGS) \
-    $(MGMT_PKGS) \
-    $(JAAS_PKGS) \
-    $(JGSS_PKGS) \
-    $(NIO_PKGS) \
-    $(OLD_JSSE_PKGS) \
-    $(HTTPSERVER_PKGS) \
-    $(SMARTCARDIO_PKGS) \
-    $(SCTPAPI_PKGS) \
-    $(APPLE_EXT_PKGS) \
-    $(JDK_PKGS)
--- a/common/makefiles/javadoc/Notes.html	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Doc Process Notes</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h3><a name="REGEXP"></a><br>
-REGEXP</h3>
-<p> REGEXP is a list of wildcard patterns that determines which packages listed
-  in CORE_PKGS.gmk go into which summary-table on the main API index page. It
-  was motivated by the need to divide the world into &quot;core packages&quot;
-  (java.*) and &quot;extension packages&quot; (javax.*). In time, the distinction
-  went away. The whole table is now called &quot;Platform Packages&quot;--which
-  eliminated the need for this list of regular expressions. But it lingered on,
-  accreting all of the packages in the JVM, one by one. I pruned it back to &quot;*&quot;,
-  so it now covers every package in the Java platform API docs. If some separation
-  is needed in the future, it can grow back into a colon-separated list, starting
-  with this, which is in all respects equivalent to &quot;*&quot; at this point
-  in time:</p>
-<blockquote>
-  <pre>REGEXP = &quot;java.*:javax.*:org.ietf*:org.omg.</pre>
-</blockquote>
-<h3><a name="releaseTargets"></a><br>
-  Release Targets</h3>
-<p> (Thanks to Kelly O'Hair for this info.)</p>
-<p> The <tt>rel-coredocs</tt> and <tt>rel-docs</tt> targets were added by Eric
-  Armstrong. <tt>rel-coredocs</tt> assumes the kind of large, 32-bit machine used
-  in the javapubs group's docs-release process. It specifies memory settings accordingly
-  to maximize performance.</p>
-<p> The performance settings, like the sanity check, are most important for the
-  core docs--the platform APIs. Running javadoc on those APIs takes a significant
-  amount of time and memory. Setting the initial heap size as large as possible
-  is important to prevent thrashing as the heap grows. Setting the maximum as
-  large as necessary is also important to keep the job from failing.</p>
-<blockquote>
-  <p> <tt>-J-Xmx512</tt> sets a maximum of 512, which became necessary in 6.0<br>
-    <tt>-J-Xms256</tt> sets starting size to 256 (default is 8)</p>
-</blockquote>
-<p> <tt>rel-coredocs</tt> also includes a sanity check to help ensure that <tt>BUILD_NUMBER</tt>
-  and <tt>MILESTONE</tt> are specified properly when docs are built outside of
-  the normal release engineering process, with the intention of releasing them
-  on the web or in a downloaded docs bundle. (When invoked in release engineering's
-  control build, the values are always set properly. But when the targets are
-  run by themselves, they default to b00 and &quot;internal&quot;--which silently
-  sabotage the result of a build that can take many hours to complete.</p>
-</body>
-</html>
--- a/common/makefiles/support/ListPathsSafely-post-compress.incl	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
--- a/common/makefiles/support/ListPathsSafely-pre-compress.incl	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-$(subst com,X01,$(subst org,X02,$(subst sun,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
--- a/common/makefiles/support/ListPathsSafely-uncompress.sed	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-s|X01|com|g
-s|X02|org|g
-s|X03|sun|g
-s|X04|java|g
-s|X05|javax|g
-s|X06|sun/io|g
-s|X07|com/sun|g
-s|X08|java/io|g
-s|X09|org/omg|g
-s|X10|org/w3c|g
-s|X11|org/xml|g
-s|X12|sun/awt|g
-s|X13|sun/net|g
-s|X14|sun/nio|g
-s|X15|sun/rmi|g
-s|X16|java/awt|g
-s|X17|java/net|g
-s|X18|java/nio|g
-s|X19|java/rmi|g
-s|X20|META-INF|g
-s|X21|sun/font|g
-s|X22|sun/misc|g
-s|X23|sun/text|g
-s|X24|sun/util|g
-s|X25|java/lang|g
-s|X26|java/math|g
-s|X27|java/text|g
-s|X28|java/util|g
-s|X29|javax/jws|g
-s|X30|javax/net|g
-s|X31|javax/rmi|g
-s|X32|javax/xml|g
-s|X33|sun/corba|g
-s|X34|sun/print|g
-s|X35|sun/swing|g
-s|X36|java/beans|g
-s|X37|javax/lang|g
-s|X38|sun/applet|g
-s|X39|sun/java2d|g
-s|X40|java/applet|g
-s|X41|javax/print|g
-s|X42|javax/sound|g
-s|X43|javax/swing|g
-s|X44|javax/tools|g
-s|X45|jdk/classes|g
-s|X46|org/relaxng|g
-s|X47|sun/reflect|g
-s|X48|javax/crypto|g
-s|X49|javax/naming|g
-s|X50|jaxp/classes|g
-s|X51|sun/security|g
-s|X52|corba/classes|g
-s|X53|java/security|g
-s|X54|javax/imageio|g
-s|X55|jdk/btclasses|g
-s|X56|javax/activity|g
-s|X57|javax/security|g
-s|X58|jdk/newclasses|g
-s|X59|sun/instrument|g
-s|X60|sun/management|g
-s|X61|corba/btclasses|g
-s|X62|jdk/democlasses|g
-s|X63|javax/activation|g
-s|X64|javax/annotation|g
-s|X65|javax/management|g
-s|X66|javax/transaction|g
-s|X67|jaxws/jaf_classes|g
-s|X68|langtools/classes|g
-s|X69|META-INF/services|g
-s|X70|jdk/newdemoclasses|g
-s|X71|javax/accessibility|g
-s|X72|jaxws/jaxws_classes|g
--- a/common/makefiles/support/unicode2x.sed	Thu Nov 21 12:28:58 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-s/\\u0020/\x20/g
-s/\\u003A/\x3A/g
-s/\\u006B/\x6B/g
-s/\\u0075/\x75/g
-s/\\u00A0/\xA0/g
-s/\\u00A3/\xA3/g
-s/\\u00B0/\xB0/g
-s/\\u00B7/\xB7/g
-s/\\u00BA/\xBA/g
-s/\\u00BF/\xBF/g
-s/\\u00C0/\xC0/g
-s/\\u00C1/\xC1/g
-s/\\u00C2/\xC2/g
-s/\\u00C4/\xC4/g
-s/\\u00C5/\xC5/g
-s/\\u00C8/\xC8/g
-s/\\u00C9/\xC9/g
-s/\\u00CA/\xCA/g
-s/\\u00CD/\xCD/g
-s/\\u00CE/\xCE/g
-s/\\u00D3/\xD3/g
-s/\\u00D4/\xD4/g
-s/\\u00D6/\xD6/g
-s/\\u00DA/\xDA/g
-s/\\u00DC/\xDC/g
-s/\\u00DD/\xDD/g
-s/\\u00DF/\xDF/g
-s/\\u00E0/\xE0/g
-s/\\u00E1/\xE1/g
-s/\\u00E2/\xE2/g
-s/\\u00E3/\xE3/g
-s/\\u00E4/\xE4/g
-s/\\u00E5/\xE5/g
-s/\\u00E6/\xE6/g
-s/\\u00E7/\xE7/g
-s/\\u00E8/\xE8/g
-s/\\u00E9/\xE9/g
-s/\\u00EA/\xEA/g
-s/\\u00EB/\xEB/g
-s/\\u00EC/\xEC/g
-s/\\u00ED/\xED/g
-s/\\u00EE/\xEE/g
-s/\\u00EF/\xEF/g
-s/\\u00F1/\xF1/g
-s/\\u00F2/\xF2/g
-s/\\u00F3/\xF3/g
-s/\\u00F4/\xF4/g
-s/\\u00F5/\xF5/g
-s/\\u00F6/\xF6/g
-s/\\u00F9/\xF9/g
-s/\\u00FA/\xFA/g
-s/\\u00FC/\xFC/g
-s/\\u0020/\x20/g
-s/\\u003f/\x3f/g
-s/\\u006f/\x6f/g
-s/\\u0075/\x75/g
-s/\\u00a0/\xa0/g
-s/\\u00a3/\xa3/g
-s/\\u00b0/\xb0/g
-s/\\u00ba/\xba/g
-s/\\u00bf/\xbf/g
-s/\\u00c1/\xc1/g
-s/\\u00c4/\xc4/g
-s/\\u00c5/\xc5/g
-s/\\u00c8/\xc8/g
-s/\\u00c9/\xc9/g
-s/\\u00ca/\xca/g
-s/\\u00cd/\xcd/g
-s/\\u00d6/\xd6/g
-s/\\u00dc/\xdc/g
-s/\\u00dd/\xdd/g
-s/\\u00df/\xdf/g
-s/\\u00e0/\xe0/g
-s/\\u00e1/\xe1/g
-s/\\u00e2/\xe2/g
-s/\\u00e3/\xe3/g
-s/\\u00e4/\xe4/g
-s/\\u00e5/\xe5/g
-s/\\u00e7/\xe7/g
-s/\\u00e8/\xe8/g
-s/\\u00e9/\xe9/g
-s/\\u00ea/\xea/g
-s/\\u00eb/\xeb/g
-s/\\u00ec/\xec/g
-s/\\u00ed/\xed/g
-s/\\u00ee/\xee/g
-s/\\u00ef/\xef/g
-s/\\u00f0/\xf0/g
-s/\\u00f1/\xf1/g
-s/\\u00f2/\xf2/g
-s/\\u00f3/\xf3/g
-s/\\u00f4/\xf4/g
-s/\\u00f5/\xf5/g
-s/\\u00f6/\xf6/g
-s/\\u00f7/\xf7/g
-s/\\u00f8/\xf8/g
-s/\\u00f9/\xf9/g
-s/\\u00fa/\xfa/g
-s/\\u00fc/\xfc/g
-s/\\u00ff/\xff/g
--- a/common/nb_native/nbproject/configurations.xml	Thu Nov 21 12:28:58 2013 -0800
+++ b/common/nb_native/nbproject/configurations.xml	Thu Dec 05 15:12:22 2013 -0800
@@ -4987,7 +4987,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -5064,7 +5064,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </ccTool>
       </folder>
@@ -5074,7 +5074,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -5083,7 +5083,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -5095,7 +5095,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="gctest.c"</Elem>
@@ -5108,7 +5108,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -5120,7 +5120,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -5135,7 +5135,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -5150,7 +5150,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -5163,7 +5163,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="minst.c"</Elem>
@@ -5176,7 +5176,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="mtrace.c"</Elem>
@@ -5188,7 +5188,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -5208,7 +5208,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -5250,7 +5250,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -5342,7 +5342,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5373,7 +5373,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -5395,7 +5395,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5425,7 +5425,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5452,7 +5452,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -5484,7 +5484,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5521,7 +5521,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5565,7 +5565,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5601,7 +5601,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5673,7 +5673,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5702,7 +5702,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5745,7 +5745,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5781,7 +5781,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5817,7 +5817,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5864,7 +5864,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5900,7 +5900,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5949,7 +5949,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -5988,7 +5988,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6011,7 +6011,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6041,7 +6041,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6072,7 +6072,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6094,7 +6094,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6136,7 +6136,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6161,7 +6161,7 @@
       <folder path="$SRC/jdk/src/share/native/sun/nio">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -6193,7 +6193,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6244,7 +6244,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -6256,7 +6256,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MP_API_COMPATIBLE</Elem>
@@ -6269,7 +6269,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -6283,7 +6283,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -6296,7 +6296,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc.c"</Elem>
@@ -6315,7 +6315,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6344,7 +6344,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6375,7 +6375,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6427,7 +6427,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>JDWP_LOGGING</Elem>
@@ -6463,7 +6463,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -6483,7 +6483,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_JPLIS_LOGGING</Elem>
@@ -6515,7 +6515,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6524,7 +6524,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
@@ -6541,7 +6541,7 @@
       <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Unix.c"</Elem>
@@ -6573,7 +6573,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6619,7 +6619,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6648,7 +6648,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6668,7 +6668,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
@@ -6682,7 +6682,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
@@ -6707,7 +6707,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6744,7 +6744,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -6773,7 +6773,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -6808,7 +6808,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6838,7 +6838,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
@@ -6860,7 +6860,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
@@ -6909,7 +6909,7 @@
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6941,7 +6941,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6952,7 +6952,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_md.c"</Elem>
@@ -6965,7 +6965,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc_md.c"</Elem>
@@ -6983,7 +6983,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
@@ -7001,7 +7001,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
@@ -7033,7 +7033,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -7071,7 +7071,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -7095,7 +7095,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="utf_md.c"</Elem>
@@ -7116,7 +7116,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="socket_md.c"</Elem>
@@ -10455,7 +10455,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -10466,7 +10466,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jli_util.c"</Elem>
@@ -10479,7 +10479,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/linux/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
@@ -10504,7 +10504,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="parse_manifest.c"</Elem>
@@ -10521,7 +10521,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="splashscreen_stubs.c"</Elem>
@@ -10538,7 +10538,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="version_comp.c"</Elem>
@@ -10552,7 +10552,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="wildcard.c"</Elem>
@@ -10992,7 +10992,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11013,7 +11013,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11035,7 +11035,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11057,7 +11057,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11079,7 +11079,7 @@
             <pElem>../../jdk/src/solaris/javavm/export</pElem>
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="main.cpp"</Elem>
@@ -11099,7 +11099,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11121,7 +11121,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11143,7 +11143,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11307,7 +11307,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -11317,7 +11317,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="check_format.c"</Elem>
@@ -11345,7 +11345,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11378,7 +11378,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11411,7 +11411,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11444,7 +11444,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11477,7 +11477,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11565,7 +11565,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11598,7 +11598,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11631,7 +11631,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11664,7 +11664,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11697,7 +11697,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11730,7 +11730,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11763,7 +11763,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11796,7 +11796,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11829,7 +11829,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11862,7 +11862,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11895,7 +11895,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11928,7 +11928,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11961,7 +11961,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11994,7 +11994,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12027,7 +12027,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12060,7 +12060,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12800,7 +12800,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12833,7 +12833,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Adler32.c"</Elem>
@@ -12860,7 +12860,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="CRC32.c"</Elem>
@@ -12887,7 +12887,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Deflater.c"</Elem>
@@ -12914,7 +12914,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inflater.c"</Elem>
@@ -12941,7 +12941,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ZipFile.c"</Elem>
@@ -12968,7 +12968,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="zip_util.c"</Elem>
@@ -13213,7 +13213,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13253,7 +13253,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13293,7 +13293,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13333,7 +13333,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13388,7 +13388,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13433,7 +13433,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13458,7 +13458,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -13483,7 +13483,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13514,7 +13514,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13545,7 +13545,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13576,7 +13576,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13607,7 +13607,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13638,7 +13638,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13669,7 +13669,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13700,7 +13700,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13731,7 +13731,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13762,7 +13762,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13793,7 +13793,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13824,7 +13824,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13855,7 +13855,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13886,7 +13886,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13917,7 +13917,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13948,7 +13948,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13979,7 +13979,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14010,7 +14010,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14041,7 +14041,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14072,7 +14072,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14103,7 +14103,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14134,7 +14134,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14165,7 +14165,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14196,7 +14196,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14227,7 +14227,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14258,7 +14258,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14289,7 +14289,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14320,7 +14320,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14351,7 +14351,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14382,7 +14382,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14413,7 +14413,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14444,7 +14444,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14475,7 +14475,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14506,7 +14506,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14537,7 +14537,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14568,7 +14568,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14599,7 +14599,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14630,7 +14630,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14661,7 +14661,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14692,7 +14692,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14723,7 +14723,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14747,7 +14747,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jpegdecoder.c"</Elem>
@@ -14775,7 +14775,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14806,7 +14806,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14837,7 +14837,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -15014,7 +15014,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -15029,7 +15029,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15045,7 +15045,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15061,7 +15061,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15077,7 +15077,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15093,7 +15093,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15109,7 +15109,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15125,7 +15125,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15141,7 +15141,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15157,7 +15157,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15173,7 +15173,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15189,7 +15189,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15205,7 +15205,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15221,7 +15221,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15237,7 +15237,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15253,7 +15253,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15269,7 +15269,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15285,7 +15285,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15301,7 +15301,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15317,7 +15317,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15333,7 +15333,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15349,7 +15349,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15365,7 +15365,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15381,7 +15381,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15397,7 +15397,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15413,7 +15413,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15429,7 +15429,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15445,7 +15445,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15461,7 +15461,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15477,7 +15477,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15493,7 +15493,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15509,7 +15509,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15525,7 +15525,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15541,7 +15541,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15557,7 +15557,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15573,7 +15573,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15589,7 +15589,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15605,7 +15605,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15621,7 +15621,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15637,7 +15637,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15653,7 +15653,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15669,7 +15669,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15685,7 +15685,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15701,7 +15701,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15717,7 +15717,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15733,7 +15733,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15749,7 +15749,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15765,7 +15765,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15781,7 +15781,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15797,7 +15797,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15813,7 +15813,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15829,7 +15829,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15845,7 +15845,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15861,7 +15861,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15877,7 +15877,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15893,7 +15893,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15983,7 +15983,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -16010,7 +16010,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -16045,7 +16045,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -16805,7 +16805,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -16836,7 +16836,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -16869,7 +16869,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -16902,7 +16902,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -18449,7 +18449,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18466,7 +18466,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18484,7 +18484,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18502,7 +18502,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18514,7 +18514,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jexec.c"</Elem>
@@ -18895,7 +18895,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -18934,7 +18934,7 @@
             <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS=true</Elem>
@@ -18971,7 +18971,7 @@
             <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS=true</Elem>
@@ -19010,7 +19010,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19051,7 +19051,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19092,7 +19092,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19133,7 +19133,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19174,7 +19174,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19215,7 +19215,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19256,7 +19256,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19297,7 +19297,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19338,7 +19338,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19378,7 +19378,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19418,7 +19418,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19459,7 +19459,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19500,7 +19500,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19541,7 +19541,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19582,7 +19582,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19623,7 +19623,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19664,7 +19664,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19705,7 +19705,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19746,7 +19746,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19787,7 +19787,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19828,7 +19828,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19869,7 +19869,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19915,7 +19915,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19956,7 +19956,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19997,7 +19997,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -20133,7 +20133,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
@@ -20149,7 +20149,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
@@ -20165,7 +20165,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="EPoll.c"</Elem>
@@ -20181,7 +20181,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="EPollArrayWrapper.c"</Elem>
@@ -20197,7 +20197,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="EPollPort.c"</Elem>
@@ -20213,7 +20213,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
@@ -20229,7 +20229,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
@@ -20245,7 +20245,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileKey.c"</Elem>
@@ -20261,7 +20261,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="IOUtil.c"</Elem>
@@ -20277,7 +20277,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="InheritedChannel.c"</Elem>
@@ -20293,7 +20293,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="NativeThread.c"</Elem>
@@ -20309,7 +20309,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Net.c"</Elem>
@@ -20325,7 +20325,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
@@ -20341,7 +20341,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
@@ -20357,7 +20357,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
@@ -20373,7 +20373,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
@@ -20389,7 +20389,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
@@ -20405,7 +20405,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
@@ -20454,7 +20454,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -20475,7 +20475,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxNativeDispatcher.c"</Elem>
@@ -20499,7 +20499,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxWatchService.c"</Elem>
@@ -20523,7 +20523,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="MagicFileTypeDetector.c"</Elem>
@@ -20547,7 +20547,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixCopyFile.c"</Elem>
@@ -20571,7 +20571,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixNativeDispatcher.c"</Elem>
@@ -20584,7 +20584,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genUnixConstants.c"</Elem>
@@ -21464,7 +21464,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -21541,7 +21541,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </ccTool>
       </folder>
@@ -21551,7 +21551,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -21560,7 +21560,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -21572,7 +21572,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="gctest.c"</Elem>
@@ -21585,7 +21585,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -21597,7 +21597,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -21612,7 +21612,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -21627,7 +21627,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -21640,7 +21640,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="minst.c"</Elem>
@@ -21653,7 +21653,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="mtrace.c"</Elem>
@@ -21665,7 +21665,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -21685,7 +21685,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -21727,7 +21727,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -21820,7 +21820,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21851,7 +21851,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -21873,7 +21873,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21903,7 +21903,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21930,7 +21930,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -21962,7 +21962,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21999,7 +21999,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -22043,7 +22043,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -22079,7 +22079,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22151,7 +22151,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22180,7 +22180,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22223,7 +22223,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22259,7 +22259,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22295,7 +22295,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22342,7 +22342,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22378,7 +22378,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22427,7 +22427,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -22466,7 +22466,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -22489,7 +22489,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22519,7 +22519,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22550,7 +22550,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22572,7 +22572,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22614,7 +22614,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22639,7 +22639,7 @@
       <folder path="$SRC/jdk/src/share/native/sun/nio">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -22671,7 +22671,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22722,7 +22722,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -22734,7 +22734,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MP_API_COMPATIBLE</Elem>
@@ -22747,7 +22747,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -22761,7 +22761,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -22774,7 +22774,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc.c"</Elem>
@@ -22793,7 +22793,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22822,7 +22822,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22853,7 +22853,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22905,7 +22905,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>JDWP_LOGGING</Elem>
@@ -22941,7 +22941,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -22961,7 +22961,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir><