diff --git a/.hgtags b/.hgtags
index 8858dcabc63..4a83ab47054 100644
--- a/.hgtags
+++ b/.hgtags
@@ -238,3 +238,5 @@ ad67c34f79c28a8e755f4a49f313868619d6702c jdk8-b112
dfa34ab293faad9b543a24646dbb381bc3ab5586 jdk8-b114
3dd9732b17034f45d111996d1d50287b05a3998c jdk8-b115
aaf663f591aba43ec942263b15ba62759ce26a1e jdk8-b116
+31b0e03fcad73d7886b306b4c2e57ad270780d0d jdk8-b117
+f5b521ade7a35cea18df78ee86322207729f5611 jdk8-b118
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 3124406b347..acd76c443c5 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -238,3 +238,5 @@ d086227bfc45d124f09b3bd72a07956b4073bf71 jdk8-b111
4f2011496393a26dcfd7b1f7787a3673ddd32599 jdk8-b114
763ada2a1d8c5962bc8c3d297e57c562d2e95338 jdk8-b115
cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116
+a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117
+0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118
diff --git a/Makefile b/Makefile
index 2ef4bb99853..c0210786d59 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
-
- # The new top level Makefile
- include NewMakefile.gmk
-
-else # Original Makefile logic
-
-BUILD_PARENT_DIRECTORY=.
-
-# 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
-
-# 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
-
-# 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
-
-
-
-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
-
- # 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)
-
+# 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))
- # Use the supplied ALT_BOOTDIR as the boot
- BOOT_CYCLE_SETTINGS=
- BOOT_CYCLE_DEBUG_SETTINGS=
+# ... and then we can include our helper functions
+include $(root_dir)/make/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)/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-)))
+
+ $(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
-build_product_image:
- $(MAKE) \
- SKIP_FASTDEBUG_BUILD=true \
- SKIP_DEBUG_BUILD=true \
- $(BOOT_CYCLE_SETTINGS) \
- generic_build_repo_series
+# 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
-# 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.
+# 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.
-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=
, 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
+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 # Build and everything it depends on. )
+ $(info . make -only # Build only, without dependencies. This)
+ $(info . # is faster but can result in incorrect build results!)
+ $(info . make clean- # Remove files generated by make for )
+ $(info )
+ $(info Useful make variables)
+ $(info . make CONF= # Build all configurations (note, assignment is empty))
+ $(info . make CONF= # Build the configuration(s) with a name matching)
+ $(info . # )
+ $(info )
+ $(info . make LOG= # Change the log level from warn to )
+ $(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= # Run parallel make jobs)
+ $(info . # Note that -jN does not work as expected!)
+ $(info )
+ $(info . make test TEST= # Only run the given test or tests, e.g.)
+ $(info . # make test TEST="jdk_lang jdk_net")
+ $(info )
+.PHONY: help
diff --git a/NewMakefile.gmk b/NewMakefile.gmk
deleted file mode 100644
index a3389ff7278..00000000000
--- a/NewMakefile.gmk
+++ /dev/null
@@ -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 # Build and everything it depends on. )
- $(info . make -only # Build only, without dependencies. This)
- $(info . # is faster but can result in incorrect build results!)
- $(info . make clean- # Remove files generated by make for )
- $(info )
- $(info Useful make variables)
- $(info . make CONF= # Build all configurations (note, assignment is empty))
- $(info . make CONF= # Build the configuration(s) with a name matching)
- $(info . # )
- $(info )
- $(info . make LOG= # Change the log level from warn to )
- $(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= # Run parallel make jobs)
- $(info . # Note that -jN does not work as expected!)
- $(info )
- $(info . make test TEST= # Only run the given test or tests, e.g.)
- $(info . # make test TEST="jdk_lang jdk_net")
- $(info )
-
-.PHONY: help
diff --git a/common/autoconf/Makefile.in b/common/autoconf/Makefile.in
index a15b53fb10f..000a9e73aa7 100644
--- a/common/autoconf/Makefile.in
+++ b/common/autoconf/Makefile.in
@@ -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
diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4
index 92d755af35f..9ef7b0400da 100644
--- a/common/autoconf/basics.m4
+++ b/common/autoconf/basics.m4
@@ -412,7 +412,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
# 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
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index edac17dcbc6..13440958a83 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -3865,7 +3865,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1383151988
+DATE_WHEN_GENERATED=1384422786
###############################################################################
#
@@ -8042,7 +8042,7 @@ fi
# 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
@@ -16201,32 +16201,25 @@ fi
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
@@ -16240,32 +16233,25 @@ fi
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
@@ -16344,7 +16330,7 @@ fi
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
@@ -16357,7 +16343,7 @@ $as_echo "yes with $LANGTOOLS_TOPDIR" >&6; }
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
@@ -16370,7 +16356,7 @@ $as_echo "yes with $CORBA_TOPDIR" >&6; }
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
@@ -16383,7 +16369,7 @@ $as_echo "yes with $JAXP_TOPDIR" >&6; }
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
@@ -16396,8 +16382,7 @@ $as_echo "yes with $JAXWS_TOPDIR" >&6; }
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
@@ -16410,7 +16395,7 @@ $as_echo "yes with $HOTSPOT_TOPDIR" >&6; }
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
@@ -16423,7 +16408,7 @@ $as_echo "yes with $NASHORN_TOPDIR" >&6; }
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
diff --git a/common/autoconf/hotspot-spec.gmk.in b/common/autoconf/hotspot-spec.gmk.in
index b5a38d25c09..82677a5be58 100644
--- a/common/autoconf/hotspot-spec.gmk.in
+++ b/common/autoconf/hotspot-spec.gmk.in
@@ -129,4 +129,4 @@ endif
# 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
diff --git a/common/autoconf/source-dirs.m4 b/common/autoconf/source-dirs.m4
index e5d1262d188..bd1d4f4d727 100644
--- a/common/autoconf/source-dirs.m4
+++ b/common/autoconf/source-dirs.m4
@@ -80,32 +80,25 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
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 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
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 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
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 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
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 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
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 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
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 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
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 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
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 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
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])
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index 3b08c6dc588..08412bc4861 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -65,8 +65,8 @@ ifeq (,$(findstring -R,$(MAKE)))
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
diff --git a/common/bin/compare.sh b/common/bin/compare.sh
index 732c6757fc7..08c0d6bb229 100644
--- a/common/bin/compare.sh
+++ b/common/bin/compare.sh
@@ -1113,14 +1113,15 @@ fi
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 [ -d "$THIS/images/j2sdk-overlay-image" ]; then
# 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 [ -d "$OTHER/j2sdk-image" ]; then
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
diff --git a/common/makefiles/Makefile b/common/makefiles/Makefile
deleted file mode 100644
index 279106bd58b..00000000000
--- a/common/makefiles/Makefile
+++ /dev/null
@@ -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
diff --git a/common/makefiles/javadoc/Notes.html b/common/makefiles/javadoc/Notes.html
deleted file mode 100644
index 2705d762bc3..00000000000
--- a/common/makefiles/javadoc/Notes.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-Doc Process Notes
-
-
-
-
-
-REGEXP
- 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 "core packages"
- (java.*) and "extension packages" (javax.*). In time, the distinction
- went away. The whole table is now called "Platform Packages"--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 "*",
- 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 "*" at this point
- in time:
-
- REGEXP = "java.*:javax.*:org.ietf*:org.omg.
-
-
- Release Targets
- (Thanks to Kelly O'Hair for this info.)
- The rel-coredocs and rel-docs targets were added by Eric
- Armstrong. rel-coredocs 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.
- 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.
-
- -J-Xmx512 sets a maximum of 512, which became necessary in 6.0
- -J-Xms256 sets starting size to 256 (default is 8)
-
- rel-coredocs also includes a sanity check to help ensure that BUILD_NUMBER
- and MILESTONE 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 "internal"--which silently
- sabotage the result of a build that can take many hours to complete.
-
-
diff --git a/common/nb_native/nbproject/configurations.xml b/common/nb_native/nbproject/configurations.xml
index b976a43ff1e..d2beed0b93a 100644
--- a/common/nb_native/nbproject/configurations.xml
+++ b/common/nb_native/nbproject/configurations.xml
@@ -4987,7 +4987,7 @@
../../jdk/src/share/back
../../jdk/src/solaris/back
../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -5064,7 +5064,7 @@
../../jdk/src/solaris/native/common
../../jdk/src/share/demo/jvmti/waiters
../../jdk/src/share/demo/jvmti/agent_util
- ../../jdk/makefiles
+ ../../jdk/make
@@ -5074,7 +5074,7 @@
../../jdk/src/share/demo/jvmti/heapTracker
../../jdk/src/share/demo/jvmti/agent_util
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
@@ -5083,7 +5083,7 @@
../../jdk/src/share/demo/jvmti/compiledMethodLoad
../../jdk/src/share/demo/jvmti/agent_util
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="compiledMethodLoad.c"
@@ -5095,7 +5095,7 @@
../../jdk/src/share/demo/jvmti/gctest
../../jdk/src/share/demo/jvmti/agent_util
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="gctest.c"
@@ -5108,7 +5108,7 @@
../../jdk/src/share/demo/jvmti/heapTracker
../../jdk/src/share/demo/jvmti/agent_util
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="heapTracker.c"
@@ -5120,7 +5120,7 @@
../../jdk/src/share/demo/jvmti/heapViewer
../../jdk/src/share/demo/jvmti/agent_util
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="heapViewer.c"
@@ -5135,7 +5135,7 @@
../../jdk/src/share/npt
../../jdk/src/solaris/npt
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="debug_malloc.c"
@@ -5150,7 +5150,7 @@
../../jdk/src/share/demo/jvmti/java_crw_demo
../../jdk/src/share/npt
../../jdk/src/solaris/npt
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="java_crw_demo.c"
@@ -5163,7 +5163,7 @@
../../jdk/src/share/demo/jvmti/minst
../../jdk/src/share/demo/jvmti/agent_util
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="minst.c"
@@ -5176,7 +5176,7 @@
../../jdk/src/share/demo/jvmti/mtrace
../../jdk/src/share/demo/jvmti/agent_util
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="mtrace.c"
@@ -5188,7 +5188,7 @@
../../jdk/src/share/demo/jvmti/versionCheck
../../jdk/src/share/demo/jvmti/agent_util
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="versionCheck.c"
@@ -5208,7 +5208,7 @@
../../jdk/src/share/instrument
../../jdk/src/solaris/instrument
../../jdk/src/share/bin
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -5250,7 +5250,7 @@
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/com/sun/media/sound
../../jdk/src/solaris/native/com/sun/media/sound
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -5342,7 +5342,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -5373,7 +5373,7 @@
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
@@ -5395,7 +5395,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -5425,7 +5425,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -5452,7 +5452,7 @@
../../jdk/src/solaris/native/sun/net/dns
../../jdk/src/solaris/native/sun/net/spi
../../jdk/src/solaris/native/sun/net/sdp
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="DatagramPacket.c"
@@ -5484,7 +5484,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -5521,7 +5521,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -5565,7 +5565,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -5601,7 +5601,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -5673,7 +5673,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -5702,7 +5702,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -5745,7 +5745,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -5781,7 +5781,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -5817,7 +5817,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -5864,7 +5864,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -5900,7 +5900,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -5949,7 +5949,7 @@
../../jdk/src/share/native/sun/java2d/pipe
../../jdk/src/solaris/native/sun/java2d
../../jdk/src/share/native/sun/java2d
- ../../jdk/makefiles
+ ../../jdk/make
HEADLESS
@@ -5988,7 +5988,7 @@
../../jdk/src/share/native/sun/java2d
../../jdk/src/share/native/sun/awt/debug
- ../../jdk/makefiles
+ ../../jdk/make
@@ -6011,7 +6011,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -6041,7 +6041,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -6072,7 +6072,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -6094,7 +6094,7 @@
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/sun/management
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -6136,7 +6136,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -6161,7 +6161,7 @@
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="genSocketOptionRegistry.c"
@@ -6193,7 +6193,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -6244,7 +6244,7 @@
../../jdk/src/share/native/sun/security/ec
../../jdk/src/share/native/sun/security/ec/impl
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="ECC_JNI.cpp"
@@ -6256,7 +6256,7 @@
../../jdk/src/share/native/sun/security/ec
../../jdk/src/share/native/sun/security/ec/impl
- ../../jdk/makefiles
+ ../../jdk/make
MP_API_COMPATIBLE
@@ -6269,7 +6269,7 @@
../../jdk/src/share/native/sun/security/jgss/wrapper
../../jdk/src/solaris/native/sun/security/jgss/wrapper
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="GSSLibStub.c"
@@ -6283,7 +6283,7 @@
../../jdk/src/solaris/native/sun/security/pkcs11
../../jdk/src/share/native/sun/security/pkcs11/wrapper
../../jdk/src/solaris/native/sun/security/pkcs11/wrapper
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="p11_convert.c"
@@ -6296,7 +6296,7 @@
../../jdk/src/share/native/sun/security/smartcardio
../../jdk/src/solaris/native/sun/security/smartcardio
../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="pcsc.c"
@@ -6315,7 +6315,7 @@
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/sun/tracing/dtrace
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -6344,7 +6344,7 @@
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/npt
../../jdk/src/solaris/npt
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -6375,7 +6375,7 @@
../../jdk/src/solaris/transport/socket
../../jdk/src/share/back/export
../../jdk/src/share/back
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -6427,7 +6427,7 @@
../../jdk/src/share/back
../../jdk/src/solaris/back
../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers
- ../../jdk/makefiles
+ ../../jdk/make
JDWP_LOGGING
@@ -6463,7 +6463,7 @@
../../jdk/src/share/npt
../../jdk/src/solaris/npt
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="hprof_md.c"
@@ -6483,7 +6483,7 @@
../../jdk/src/share/instrument
../../jdk/src/solaris/instrument
../../jdk/src/share/bin
- ../../jdk/makefiles
+ ../../jdk/make
NO_JPLIS_LOGGING
@@ -6515,7 +6515,7 @@
../../jdk/src/share/native/sun/management
- ../../jdk/makefiles
+ ../../jdk/make
@@ -6524,7 +6524,7 @@
../../jdk/src/share/native/com/sun/media/sound
../../jdk/src/solaris/native/com/sun/media/sound
- ../../jdk/makefiles
+ ../../jdk/make
EXTRA_SOUND_JNI_LIBS=" jsoundalsa"
@@ -6541,7 +6541,7 @@
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="Unix.c"
@@ -6573,7 +6573,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -6619,7 +6619,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -6648,7 +6648,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -6668,7 +6668,7 @@
../../jdk/src/solaris/native/sun/net/dns
../../jdk/src/solaris/native/sun/net/spi
../../jdk/src/solaris/native/sun/net/sdp
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="Inet4AddressImpl.c"
@@ -6682,7 +6682,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="MappedByteBuffer.c"
@@ -6707,7 +6707,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -6744,7 +6744,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -6773,7 +6773,7 @@
../../jdk/src/share/native/sun/java2d/pipe
../../jdk/src/solaris/native/sun/java2d
../../jdk/src/share/native/sun/java2d
- ../../jdk/makefiles
+ ../../jdk/make
HEADLESS
@@ -6808,7 +6808,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -6838,7 +6838,7 @@
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/sun/management
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="FileSystemImpl.c"
@@ -6860,7 +6860,7 @@
../../jdk/src/solaris/native/sun/net/dns
../../jdk/src/solaris/native/sun/net/spi
../../jdk/src/solaris/native/sun/net/sdp
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="ResolverConfigurationImpl.c"
@@ -6909,7 +6909,7 @@
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/sun/nio/ch
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
@@ -6941,7 +6941,7 @@
../../jdk/src/share/native/sun/security/jgss/wrapper
../../jdk/src/solaris/native/sun/security/jgss/wrapper
- ../../jdk/makefiles
+ ../../jdk/make
@@ -6952,7 +6952,7 @@
../../jdk/src/solaris/native/sun/security/pkcs11
../../jdk/src/share/native/sun/security/pkcs11/wrapper
../../jdk/src/solaris/native/sun/security/pkcs11/wrapper
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="p11_md.c"
@@ -6965,7 +6965,7 @@
../../jdk/src/share/native/sun/security/smartcardio
../../jdk/src/solaris/native/sun/security/smartcardio
../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="pcsc_md.c"
@@ -6983,7 +6983,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="LinuxVirtualMachine.c"
@@ -7001,7 +7001,7 @@
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/sun/tracing/dtrace
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="jvm_symbols_md.c"
@@ -7033,7 +7033,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -7071,7 +7071,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -7095,7 +7095,7 @@
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/npt
../../jdk/src/solaris/npt
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="utf_md.c"
@@ -7116,7 +7116,7 @@
../../jdk/src/solaris/transport/socket
../../jdk/src/share/back/export
../../jdk/src/share/back
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="socket_md.c"
@@ -10455,7 +10455,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
@@ -10466,7 +10466,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="jli_util.c"
@@ -10479,7 +10479,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/linux/bin
- ../../jdk/makefiles
+ ../../jdk/make
EXPAND_CLASSPATH_WILDCARDS
@@ -10504,7 +10504,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="parse_manifest.c"
@@ -10521,7 +10521,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="splashscreen_stubs.c"
@@ -10538,7 +10538,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="version_comp.c"
@@ -10552,7 +10552,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="wildcard.c"
@@ -10992,7 +10992,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -11013,7 +11013,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -11035,7 +11035,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -11057,7 +11057,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -11079,7 +11079,7 @@
../../jdk/src/solaris/javavm/export
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="main.cpp"
@@ -11099,7 +11099,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -11121,7 +11121,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -11143,7 +11143,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -11307,7 +11307,7 @@
flavor2="0">
- ../../jdk/makefiles
+ ../../jdk/make
@@ -11317,7 +11317,7 @@
flavor2="0">
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="check_format.c"
@@ -11345,7 +11345,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11378,7 +11378,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11411,7 +11411,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11444,7 +11444,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11477,7 +11477,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11565,7 +11565,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11598,7 +11598,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11631,7 +11631,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11664,7 +11664,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11697,7 +11697,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11730,7 +11730,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11763,7 +11763,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11796,7 +11796,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11829,7 +11829,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11862,7 +11862,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11895,7 +11895,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11928,7 +11928,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11961,7 +11961,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -11994,7 +11994,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -12027,7 +12027,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -12060,7 +12060,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -12800,7 +12800,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -12833,7 +12833,7 @@
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
../../jdk/src/share/native/java/io
../../jdk/src/solaris/native/java/io
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="Adler32.c"
@@ -12860,7 +12860,7 @@
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
../../jdk/src/share/native/java/io
../../jdk/src/solaris/native/java/io
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="CRC32.c"
@@ -12887,7 +12887,7 @@
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
../../jdk/src/share/native/java/io
../../jdk/src/solaris/native/java/io
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="Deflater.c"
@@ -12914,7 +12914,7 @@
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
../../jdk/src/share/native/java/io
../../jdk/src/solaris/native/java/io
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="Inflater.c"
@@ -12941,7 +12941,7 @@
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
../../jdk/src/share/native/java/io
../../jdk/src/solaris/native/java/io
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="ZipFile.c"
@@ -12968,7 +12968,7 @@
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
../../jdk/src/share/native/java/io
../../jdk/src/solaris/native/java/io
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="zip_util.c"
@@ -13213,7 +13213,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -13253,7 +13253,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -13293,7 +13293,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -13333,7 +13333,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -13388,7 +13388,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -13433,7 +13433,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -13458,7 +13458,7 @@
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/sun/awt/image/jpeg
- ../../jdk/makefiles
+ ../../jdk/make
@@ -13483,7 +13483,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13514,7 +13514,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13545,7 +13545,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13576,7 +13576,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13607,7 +13607,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13638,7 +13638,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13669,7 +13669,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13700,7 +13700,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13731,7 +13731,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13762,7 +13762,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13793,7 +13793,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13824,7 +13824,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13855,7 +13855,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13886,7 +13886,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13917,7 +13917,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13948,7 +13948,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -13979,7 +13979,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14010,7 +14010,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14041,7 +14041,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14072,7 +14072,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14103,7 +14103,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14134,7 +14134,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14165,7 +14165,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14196,7 +14196,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14227,7 +14227,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14258,7 +14258,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14289,7 +14289,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14320,7 +14320,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14351,7 +14351,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14382,7 +14382,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14413,7 +14413,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14444,7 +14444,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14475,7 +14475,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14506,7 +14506,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14537,7 +14537,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14568,7 +14568,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14599,7 +14599,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14630,7 +14630,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14661,7 +14661,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14692,7 +14692,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14723,7 +14723,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14747,7 +14747,7 @@
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/sun/awt/image/jpeg
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="jpegdecoder.c"
@@ -14775,7 +14775,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14806,7 +14806,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -14837,7 +14837,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -15014,7 +15014,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -15029,7 +15029,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15045,7 +15045,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15061,7 +15061,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15077,7 +15077,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15093,7 +15093,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15109,7 +15109,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15125,7 +15125,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15141,7 +15141,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15157,7 +15157,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15173,7 +15173,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15189,7 +15189,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15205,7 +15205,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15221,7 +15221,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15237,7 +15237,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15253,7 +15253,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15269,7 +15269,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15285,7 +15285,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15301,7 +15301,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15317,7 +15317,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15333,7 +15333,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15349,7 +15349,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15365,7 +15365,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15381,7 +15381,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15397,7 +15397,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15413,7 +15413,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15429,7 +15429,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15445,7 +15445,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15461,7 +15461,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15477,7 +15477,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15493,7 +15493,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15509,7 +15509,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15525,7 +15525,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15541,7 +15541,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15557,7 +15557,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15573,7 +15573,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15589,7 +15589,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15605,7 +15605,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15621,7 +15621,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15637,7 +15637,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15653,7 +15653,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15669,7 +15669,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15685,7 +15685,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15701,7 +15701,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15717,7 +15717,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15733,7 +15733,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15749,7 +15749,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15765,7 +15765,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15781,7 +15781,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15797,7 +15797,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15813,7 +15813,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15829,7 +15829,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15845,7 +15845,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15861,7 +15861,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15877,7 +15877,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15893,7 +15893,7 @@
../../jdk/src/share/native/sun/awt/medialib
../../jdk/src/solaris/native/sun/awt/medialib
- ../../jdk/makefiles
+ ../../jdk/make
MLIB_OS64BIT
@@ -15983,7 +15983,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -16010,7 +16010,7 @@
../../jdk/src/share/native/sun/java2d/pipe
../../jdk/src/solaris/native/sun/java2d
../../jdk/src/share/native/sun/java2d
- ../../jdk/makefiles
+ ../../jdk/make
HEADLESS
@@ -16045,7 +16045,7 @@
../../jdk/src/share/native/sun/java2d/pipe
../../jdk/src/solaris/native/sun/java2d
../../jdk/src/share/native/sun/java2d
- ../../jdk/makefiles
+ ../../jdk/make
HEADLESS
@@ -16805,7 +16805,7 @@
../../jdk/src/share/native/sun/java2d/pipe
../../jdk/src/solaris/native/sun/java2d
../../jdk/src/share/native/sun/java2d
- ../../jdk/makefiles
+ ../../jdk/make
HEADLESS
@@ -16836,7 +16836,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -16869,7 +16869,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -16902,7 +16902,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -18449,7 +18449,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
LIBARCHNAME="amd64"
@@ -18466,7 +18466,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
LIBARCHNAME="amd64"
@@ -18484,7 +18484,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
LIBARCHNAME="amd64"
@@ -18502,7 +18502,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
LIBARCHNAME="amd64"
@@ -18514,7 +18514,7 @@
../../jdk/src/share/bin
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="jexec.c"
@@ -18895,7 +18895,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -18934,7 +18934,7 @@
../../jdk/src/solaris/native/sun/awt
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
HEADLESS=true
@@ -18971,7 +18971,7 @@
../../jdk/src/solaris/native/sun/awt
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
HEADLESS=true
@@ -19010,7 +19010,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19051,7 +19051,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19092,7 +19092,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19133,7 +19133,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19174,7 +19174,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19215,7 +19215,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19256,7 +19256,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19297,7 +19297,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19338,7 +19338,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19378,7 +19378,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19418,7 +19418,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19459,7 +19459,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19500,7 +19500,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19541,7 +19541,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19582,7 +19582,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19623,7 +19623,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19664,7 +19664,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19705,7 +19705,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19746,7 +19746,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19787,7 +19787,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19828,7 +19828,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19869,7 +19869,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19915,7 +19915,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19956,7 +19956,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -19997,7 +19997,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -20133,7 +20133,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="DatagramChannelImpl.c"
@@ -20149,7 +20149,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="DatagramDispatcher.c"
@@ -20165,7 +20165,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="EPoll.c"
@@ -20181,7 +20181,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="EPollArrayWrapper.c"
@@ -20197,7 +20197,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="EPollPort.c"
@@ -20213,7 +20213,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="FileChannelImpl.c"
@@ -20229,7 +20229,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="FileDispatcherImpl.c"
@@ -20245,7 +20245,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="FileKey.c"
@@ -20261,7 +20261,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="IOUtil.c"
@@ -20277,7 +20277,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="InheritedChannel.c"
@@ -20293,7 +20293,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="NativeThread.c"
@@ -20309,7 +20309,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="Net.c"
@@ -20325,7 +20325,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="PollArrayWrapper.c"
@@ -20341,7 +20341,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="ServerSocketChannelImpl.c"
@@ -20357,7 +20357,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="SocketChannelImpl.c"
@@ -20373,7 +20373,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="SocketDispatcher.c"
@@ -20389,7 +20389,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"
@@ -20405,7 +20405,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="UnixAsynchronousSocketChannelImpl.c"
@@ -20454,7 +20454,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
@@ -20475,7 +20475,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="LinuxNativeDispatcher.c"
@@ -20499,7 +20499,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="LinuxWatchService.c"
@@ -20523,7 +20523,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="MagicFileTypeDetector.c"
@@ -20547,7 +20547,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="UnixCopyFile.c"
@@ -20571,7 +20571,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="UnixNativeDispatcher.c"
@@ -20584,7 +20584,7 @@
flavor2="0">
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="genUnixConstants.c"
@@ -21464,7 +21464,7 @@
../../jdk/src/share/back
../../jdk/src/solaris/back
../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -21541,7 +21541,7 @@
../../jdk/src/solaris/native/common
../../jdk/src/share/demo/jvmti/waiters
../../jdk/src/share/demo/jvmti/agent_util
- ../../jdk/makefiles
+ ../../jdk/make
@@ -21551,7 +21551,7 @@
../../jdk/src/share/demo/jvmti/heapTracker
../../jdk/src/share/demo/jvmti/agent_util
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
@@ -21560,7 +21560,7 @@
../../jdk/src/share/demo/jvmti/compiledMethodLoad
../../jdk/src/share/demo/jvmti/agent_util
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="compiledMethodLoad.c"
@@ -21572,7 +21572,7 @@
../../jdk/src/share/demo/jvmti/gctest
../../jdk/src/share/demo/jvmti/agent_util
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="gctest.c"
@@ -21585,7 +21585,7 @@
../../jdk/src/share/demo/jvmti/heapTracker
../../jdk/src/share/demo/jvmti/agent_util
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="heapTracker.c"
@@ -21597,7 +21597,7 @@
../../jdk/src/share/demo/jvmti/heapViewer
../../jdk/src/share/demo/jvmti/agent_util
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="heapViewer.c"
@@ -21612,7 +21612,7 @@
../../jdk/src/share/npt
../../jdk/src/solaris/npt
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="debug_malloc.c"
@@ -21627,7 +21627,7 @@
../../jdk/src/share/demo/jvmti/java_crw_demo
../../jdk/src/share/npt
../../jdk/src/solaris/npt
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="java_crw_demo.c"
@@ -21640,7 +21640,7 @@
../../jdk/src/share/demo/jvmti/minst
../../jdk/src/share/demo/jvmti/agent_util
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="minst.c"
@@ -21653,7 +21653,7 @@
../../jdk/src/share/demo/jvmti/mtrace
../../jdk/src/share/demo/jvmti/agent_util
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="mtrace.c"
@@ -21665,7 +21665,7 @@
../../jdk/src/share/demo/jvmti/versionCheck
../../jdk/src/share/demo/jvmti/agent_util
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="versionCheck.c"
@@ -21685,7 +21685,7 @@
../../jdk/src/share/instrument
../../jdk/src/solaris/instrument
../../jdk/src/share/bin
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -21727,7 +21727,7 @@
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/com/sun/media/sound
../../jdk/src/solaris/native/com/sun/media/sound
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -21820,7 +21820,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -21851,7 +21851,7 @@
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
@@ -21873,7 +21873,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -21903,7 +21903,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -21930,7 +21930,7 @@
../../jdk/src/solaris/native/sun/net/dns
../../jdk/src/solaris/native/sun/net/spi
../../jdk/src/solaris/native/sun/net/sdp
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="DatagramPacket.c"
@@ -21962,7 +21962,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -21999,7 +21999,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -22043,7 +22043,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -22079,7 +22079,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -22151,7 +22151,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -22180,7 +22180,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -22223,7 +22223,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -22259,7 +22259,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -22295,7 +22295,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -22342,7 +22342,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -22378,7 +22378,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -22427,7 +22427,7 @@
../../jdk/src/share/native/sun/java2d/pipe
../../jdk/src/solaris/native/sun/java2d
../../jdk/src/share/native/sun/java2d
- ../../jdk/makefiles
+ ../../jdk/make
HEADLESS
@@ -22466,7 +22466,7 @@
../../jdk/src/share/native/sun/java2d
../../jdk/src/share/native/sun/awt/debug
- ../../jdk/makefiles
+ ../../jdk/make
@@ -22489,7 +22489,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -22519,7 +22519,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -22550,7 +22550,7 @@
../../jdk/src/solaris/native/sun/java2d/opengl
../../jdk/src/share/native/sun/font
../../jdk/src/solaris/native/sun/java2d/x11
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -22572,7 +22572,7 @@
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/sun/management
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -22614,7 +22614,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -22639,7 +22639,7 @@
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="genSocketOptionRegistry.c"
@@ -22671,7 +22671,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -22722,7 +22722,7 @@
../../jdk/src/share/native/sun/security/ec
../../jdk/src/share/native/sun/security/ec/impl
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="ECC_JNI.cpp"
@@ -22734,7 +22734,7 @@
../../jdk/src/share/native/sun/security/ec
../../jdk/src/share/native/sun/security/ec/impl
- ../../jdk/makefiles
+ ../../jdk/make
MP_API_COMPATIBLE
@@ -22747,7 +22747,7 @@
../../jdk/src/share/native/sun/security/jgss/wrapper
../../jdk/src/solaris/native/sun/security/jgss/wrapper
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="GSSLibStub.c"
@@ -22761,7 +22761,7 @@
../../jdk/src/solaris/native/sun/security/pkcs11
../../jdk/src/share/native/sun/security/pkcs11/wrapper
../../jdk/src/solaris/native/sun/security/pkcs11/wrapper
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="p11_convert.c"
@@ -22774,7 +22774,7 @@
../../jdk/src/share/native/sun/security/smartcardio
../../jdk/src/solaris/native/sun/security/smartcardio
../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="pcsc.c"
@@ -22793,7 +22793,7 @@
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/sun/tracing/dtrace
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -22822,7 +22822,7 @@
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/npt
../../jdk/src/solaris/npt
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -22853,7 +22853,7 @@
../../jdk/src/solaris/transport/socket
../../jdk/src/share/back/export
../../jdk/src/share/back
- ../../jdk/makefiles
+ ../../jdk/make
ARCH="amd64"
@@ -22905,7 +22905,7 @@
../../jdk/src/share/back
../../jdk/src/solaris/back
../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers
- ../../jdk/makefiles
+ ../../jdk/make
JDWP_LOGGING
@@ -22941,7 +22941,7 @@
../../jdk/src/share/npt
../../jdk/src/solaris/npt
../../jdk/src/share/demo/jvmti/java_crw_demo
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="hprof_md.c"
@@ -22961,7 +22961,7 @@
../../jdk/src/share/instrument
../../jdk/src/solaris/instrument
../../jdk/src/share/bin
- ../../jdk/makefiles
+ ../../jdk/make
NO_JPLIS_LOGGING
@@ -22993,7 +22993,7 @@
../../jdk/src/share/native/sun/management
- ../../jdk/makefiles
+ ../../jdk/make
@@ -23002,7 +23002,7 @@
../../jdk/src/share/native/com/sun/media/sound
../../jdk/src/solaris/native/com/sun/media/sound
- ../../jdk/makefiles
+ ../../jdk/make
EXTRA_SOUND_JNI_LIBS=" jsoundalsa"
@@ -23019,7 +23019,7 @@
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="Unix.c"
@@ -23051,7 +23051,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -23097,7 +23097,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -23126,7 +23126,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -23146,7 +23146,7 @@
../../jdk/src/solaris/native/sun/net/dns
../../jdk/src/solaris/native/sun/net/spi
../../jdk/src/solaris/native/sun/net/sdp
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="Inet4AddressImpl.c"
@@ -23160,7 +23160,7 @@
../../jdk/src/share/native/java/io
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="MappedByteBuffer.c"
@@ -23185,7 +23185,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -23222,7 +23222,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
PNG_NO_MMX_CODE
@@ -23251,7 +23251,7 @@
../../jdk/src/share/native/sun/java2d/pipe
../../jdk/src/solaris/native/sun/java2d
../../jdk/src/share/native/sun/java2d
- ../../jdk/makefiles
+ ../../jdk/make
HEADLESS
@@ -23286,7 +23286,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -23316,7 +23316,7 @@
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/sun/management
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="FileSystemImpl.c"
@@ -23338,7 +23338,7 @@
../../jdk/src/solaris/native/sun/net/dns
../../jdk/src/solaris/native/sun/net/spi
../../jdk/src/solaris/native/sun/net/sdp
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="ResolverConfigurationImpl.c"
@@ -23387,7 +23387,7 @@
../../jdk/src/share/native/java/net
../../jdk/src/solaris/native/sun/nio/ch
../../jdk/src/solaris/native/java/net
- ../../jdk/makefiles
+ ../../jdk/make
@@ -23419,7 +23419,7 @@
../../jdk/src/share/native/sun/security/jgss/wrapper
../../jdk/src/solaris/native/sun/security/jgss/wrapper
- ../../jdk/makefiles
+ ../../jdk/make
@@ -23430,7 +23430,7 @@
../../jdk/src/solaris/native/sun/security/pkcs11
../../jdk/src/share/native/sun/security/pkcs11/wrapper
../../jdk/src/solaris/native/sun/security/pkcs11/wrapper
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="p11_md.c"
@@ -23443,7 +23443,7 @@
../../jdk/src/share/native/sun/security/smartcardio
../../jdk/src/solaris/native/sun/security/smartcardio
../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="pcsc_md.c"
@@ -23461,7 +23461,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="LinuxVirtualMachine.c"
@@ -23479,7 +23479,7 @@
../../jdk/src/solaris/native/common
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/native/sun/tracing/dtrace
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="jvm_symbols_md.c"
@@ -23511,7 +23511,7 @@
../../jdk/src/solaris/native/java/util
../../jdk/src/solaris/native/sun/util/locale/provider
../../jdk/src/share/native/java/lang/fdlibm/include
- ../../jdk/makefiles
+ ../../jdk/make
ARCHPROPNAME="amd64"
@@ -23549,7 +23549,7 @@
../../jdk/src/share/native/sun/awt/image
../../jdk/src/share/native/sun/awt/image/cvutils
../../jdk/src/solaris/native/sun/jdga
- ../../jdk/makefiles
+ ../../jdk/make
INTERNAL_BUILD
@@ -23573,7 +23573,7 @@
../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers
../../jdk/src/share/npt
../../jdk/src/solaris/npt
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="utf_md.c"
@@ -23594,7 +23594,7 @@
../../jdk/src/solaris/transport/socket
../../jdk/src/share/back/export
../../jdk/src/share/back
- ../../jdk/makefiles
+ ../../jdk/make
THIS_FILE="socket_md.c"
@@ -28097,7 +28097,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
LIBARCH32NAME="i386"
@@ -28112,7 +28112,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
LIBARCH32NAME="i386"
@@ -28126,7 +28126,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
- ../../jdk/makefiles
+ ../../jdk/make
EXPAND_CLASSPATH_WILDCARDS
@@ -28152,7 +28152,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
LIBARCH32NAME="i386"
@@ -28171,7 +28171,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
LIBARCH32NAME="i386"
@@ -28190,7 +28190,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
LIBARCH32NAME="i386"
@@ -28206,7 +28206,7 @@
../../jdk/src/share/bin
../../jdk/src/solaris/bin
../../jdk/src/share/native/java/util/zip/zlib-1.2.5
- ../../jdk/makefiles
+ ../../jdk/make
LIBARCH32NAME="i386"
@@ -28648,7 +28648,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -28669,7 +28669,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -28691,7 +28691,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -28713,7 +28713,7 @@
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers
- ../../jdk/makefiles
+ ../../jdk/make
NO_ZLIB
@@ -28735,7 +28735,7 @@
../../jdk/src/solaris/javavm/export
../../jdk/src/share/native/common
../../jdk/src/solaris/native/common
- ../../jdk/makefiles
+ ../../jdk/make