1.1 --- a/common/autoconf/spec.gmk.in Wed Oct 09 18:51:32 2013 -0700
1.2 +++ b/common/autoconf/spec.gmk.in Thu Oct 10 14:58:19 2013 +0200
1.3 @@ -30,8 +30,8 @@
1.4 # (called @OPENJDK_BUILD_AUTOCONF_NAME@ by autoconf)
1.5 # using 'configure @CONFIGURE_COMMAND_LINE@'
1.6
1.7 -# When calling macros, the spaces between arguments are
1.8 -# often semantically important! Sometimes we need to subst
1.9 +# When calling macros, the spaces between arguments are
1.10 +# often semantically important! Sometimes we need to subst
1.11 # spaces and commas, therefore we need the following macros.
1.12 X:=
1.13 SPACE:=$(X) $(X)
1.14 @@ -56,17 +56,17 @@
1.15
1.16 # Pass along the verbosity and log level settings.
1.17 ifeq (,$(findstring VERBOSE=,$(MAKE)))
1.18 - MAKE:=$(MAKE) $(VERBOSE) VERBOSE="$(VERBOSE)" LOG_LEVEL="$(LOG_LEVEL)"
1.19 + MAKE:=$(MAKE) $(VERBOSE) VERBOSE="$(VERBOSE)" LOG_LEVEL="$(LOG_LEVEL)"
1.20 endif
1.21
1.22 # No implicit variables or rules!
1.23 ifeq (,$(findstring -R,$(MAKE)))
1.24 - MAKE:=$(MAKE) -R
1.25 + MAKE:=$(MAKE) -R
1.26 endif
1.27
1.28 # Specify where the common include directory for makefiles is.
1.29 ifeq (,$(findstring -I @SRC_ROOT@/common/makefiles,$(MAKE)))
1.30 - MAKE:=$(MAKE) -I @SRC_ROOT@/common/makefiles
1.31 + MAKE:=$(MAKE) -I @SRC_ROOT@/common/makefiles
1.32 endif
1.33
1.34 # The "human readable" name of this configuration
1.35 @@ -175,7 +175,7 @@
1.36 RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
1.37 endif
1.38
1.39 -ifneq ($(USER_RELEASE_SUFFIX),)
1.40 +ifneq ($(USER_RELEASE_SUFFIX), )
1.41 FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER)
1.42 else
1.43 FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER)
1.44 @@ -287,7 +287,7 @@
1.45 # Enable unlimited crypto policy
1.46 UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
1.47
1.48 -# Necessary additional compiler flags to compile X11
1.49 +# Necessary additional compiler flags to compile X11
1.50 X_CFLAGS:=@X_CFLAGS@
1.51 X_LIBS:=@X_LIBS@
1.52 OPENWIN_HOME:=@OPENWIN_HOME@
1.53 @@ -388,7 +388,7 @@
1.54 # Command to create a shared library
1.55 SHARED_LIBRARY_FLAGS:=@SHARED_LIBRARY_FLAGS@
1.56
1.57 -# Options to linker to specify a mapfile.
1.58 +# Options to linker to specify a mapfile.
1.59 # (Note absence of := assignment, because we do not want to evaluate the macro body here)
1.60 SET_SHARED_LIBRARY_MAPFILE=@SET_SHARED_LIBRARY_MAPFILE@
1.61
1.62 @@ -461,7 +461,7 @@
1.63 # Guarding this against resetting value. Legacy make files include spec multiple
1.64 # times.
1.65 ifndef RC_FLAGS
1.66 -RC_FLAGS:=@RC_FLAGS@
1.67 + RC_FLAGS:=@RC_FLAGS@
1.68 endif
1.69
1.70 # A specific java binary with specific options can be used to run
1.71 @@ -541,9 +541,9 @@
1.72 # we have solved how to prevent the log wrapper to wait
1.73 # for the background sjavac server process.
1.74 ifeq (@ENABLE_SJAVAC@X@OPENJDK_BUILD_OS_API@,yesXwinapi)
1.75 - BUILD_LOG_WRAPPER:=
1.76 + BUILD_LOG_WRAPPER:=
1.77 else
1.78 - BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
1.79 + BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
1.80 endif
1.81
1.82 # Build setup
1.83 @@ -563,12 +563,12 @@
1.84 # of the next macro to get rid of superfluous files.
1.85 ADD_SRCS=$1
1.86 ifneq (,$(ADD_SRC_ROOT))
1.87 - # Append wildcard rule to pickup any matching source roots found below ADD_SRC_ROOT
1.88 - ADD_SRCS+=$(wildcard $(subst $(SRC_ROOT),$(ADD_SRC_ROOT),$1))
1.89 + # Append wildcard rule to pickup any matching source roots found below ADD_SRC_ROOT
1.90 + ADD_SRCS+=$(wildcard $(subst $(SRC_ROOT),$(ADD_SRC_ROOT),$1))
1.91 endif
1.92 ifneq (,$(OVERRIDE_SRC_ROOT))
1.93 - # Append wildcard rule to pickup any matching source roots found below OVERRIDE_SRC_ROOT
1.94 - ADD_SRCS+=$(wildcard $(subst $(SRC_ROOT),$(OVERRIDE_SRC_ROOT),$1))
1.95 + # Append wildcard rule to pickup any matching source roots found below OVERRIDE_SRC_ROOT
1.96 + ADD_SRCS+=$(wildcard $(subst $(SRC_ROOT),$(OVERRIDE_SRC_ROOT),$1))
1.97 endif
1.98
1.99 # OVR_SRCS creates a filter expression to filter out sources in
1.100 @@ -578,9 +578,9 @@
1.101 # We cannot do the scan in configure, since that would force us to rerun configure when
1.102 # we add overridden sources.
1.103 ifneq (,$(OVERRIDE_SRC_ROOT))
1.104 - OVR_SRCS:=$(addsuffix %,$(subst $(OVERRIDE_SRC_ROOT),$(SRC_ROOT),$(sort $(dir $(shell $(FIND) $(OVERRIDE_SRC_ROOT) -type f)))))
1.105 + OVR_SRCS:=$(addsuffix %,$(subst $(OVERRIDE_SRC_ROOT),$(SRC_ROOT),$(sort $(dir $(shell $(FIND) $(OVERRIDE_SRC_ROOT) -type f)))))
1.106 else
1.107 - OVR_SRCS:=
1.108 + OVR_SRCS:=
1.109 endif
1.110
1.111 ####################################################
1.112 @@ -589,7 +589,7 @@
1.113 #
1.114
1.115 # Common prefix for all installed files. Defaults to /usr/local,
1.116 -# but /opt/myjdk is another common version.
1.117 +# but /opt/myjdk is another common version.
1.118 INSTALL_PREFIX=@prefix@
1.119
1.120 # Directories containing architecture-dependent files should be relative to exec_prefix
1.121 @@ -619,7 +619,7 @@
1.122 # Executables that other programs run.
1.123 INSTALL_LIBEXECDIR=@libexecdir@
1.124
1.125 -# Locale-dependent but architecture-independent data, such as message catalogs.
1.126 +# Locale-dependent but architecture-independent data, such as message catalogs.
1.127 INSTALL_LOCALEDIR=@localedir@
1.128
1.129 # Modifiable single-machine data
