1.1 --- a/make/Makefile Mon May 06 13:53:13 2013 -0700
1.2 +++ b/make/Makefile Mon May 06 19:49:23 2013 -0700
1.3 @@ -151,32 +151,43 @@
1.4 $(MAKE_ARGS) BUILD_FLAVOR=product docs
1.5 endif
1.6
1.7 +# Output directories
1.8 +C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
1.9 +C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
1.10 +MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
1.11 +ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero
1.12 +SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark
1.13 +
1.14 # Build variation of hotspot
1.15 $(C1_VM_TARGETS):
1.16 $(CD) $(GAMMADIR)/make; \
1.17 - $(MAKE) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT)
1.18 + $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT)
1.19
1.20 $(C2_VM_TARGETS):
1.21 $(CD) $(GAMMADIR)/make; \
1.22 - $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
1.23 + $(MAKE) BUILD_DIR=$(C2_DIR) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
1.24
1.25 $(ZERO_VM_TARGETS):
1.26 $(CD) $(GAMMADIR)/make; \
1.27 - $(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \
1.28 - generic_buildzero $(ALT_OUT)
1.29 + $(MAKE) BUILD_DIR=$(ZERO_DIR) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
1.30
1.31 $(SHARK_VM_TARGETS):
1.32 $(CD) $(GAMMADIR)/make; \
1.33 - $(MAKE) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ \
1.34 - generic_buildshark $(ALT_OUT)
1.35 + $(MAKE) BUILD_DIR=$(SHARK_DIR) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ generic_buildshark $(ALT_OUT)
1.36
1.37 $(MINIMAL1_VM_TARGETS):
1.38 $(CD) $(GAMMADIR)/make; \
1.39 - $(MAKE) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ \
1.40 - generic_buildminimal1 $(ALT_OUT)
1.41 + $(MAKE) BUILD_DIR=$(MINIMAL1_DIR) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ generic_buildminimal1 $(ALT_OUT)
1.42 +
1.43 +# Install hotspot script in build directory
1.44 +HOTSPOT_SCRIPT=$(BUILD_DIR)/$(BUILD_FLAVOR)/hotspot
1.45 +$(HOTSPOT_SCRIPT): $(GAMMADIR)/make/hotspot.script
1.46 + $(QUIETLY) $(MKDIR) -p $(BUILD_DIR)/$(BUILD_FLAVOR)
1.47 + $(QUIETLY) cat $< | sed -e 's|@@LIBARCH@@|$(LIBARCH)|g' | sed -e 's|@@JDK_IMPORT_PATH@@|$(JDK_IMPORT_PATH)|g' > $@
1.48 + $(QUIETLY) chmod +x $@
1.49
1.50 # Build compiler1 (client) rule, different for platforms
1.51 -generic_build1:
1.52 +generic_build1: $(HOTSPOT_SCRIPT)
1.53 $(MKDIR) -p $(OUTPUTDIR)
1.54 ifeq ($(OSNAME),windows)
1.55 ifeq ($(ARCH_DATA_MODEL), 32)
1.56 @@ -201,7 +212,7 @@
1.57 endif
1.58
1.59 # Build compiler2 (server) rule, different for platforms
1.60 -generic_build2:
1.61 +generic_build2: $(HOTSPOT_SCRIPT)
1.62 $(MKDIR) -p $(OUTPUTDIR)
1.63 ifeq ($(OSNAME),windows)
1.64 $(CD) $(OUTPUTDIR); \
1.65 @@ -217,19 +228,19 @@
1.66 $(MAKE_ARGS) $(VM_TARGET)
1.67 endif
1.68
1.69 -generic_buildzero:
1.70 +generic_buildzero: $(HOTSPOT_SCRIPT)
1.71 $(MKDIR) -p $(OUTPUTDIR)
1.72 $(CD) $(OUTPUTDIR); \
1.73 $(MAKE) -f $(ABS_OS_MAKEFILE) \
1.74 $(MAKE_ARGS) $(VM_TARGET)
1.75
1.76 -generic_buildshark:
1.77 +generic_buildshark: $(HOTSPOT_SCRIPT)
1.78 $(MKDIR) -p $(OUTPUTDIR)
1.79 $(CD) $(OUTPUTDIR); \
1.80 $(MAKE) -f $(ABS_OS_MAKEFILE) \
1.81 $(MAKE_ARGS) $(VM_TARGET)
1.82
1.83 -generic_buildminimal1:
1.84 +generic_buildminimal1: $(HOTSPOT_SCRIPT)
1.85 ifeq ($(JVM_VARIANT_MINIMAL1),true)
1.86 $(MKDIR) -p $(OUTPUTDIR)
1.87 ifeq ($(ARCH_DATA_MODEL), 32)
1.88 @@ -252,224 +263,210 @@
1.89
1.90 # Export file rule
1.91 generic_export: $(EXPORT_LIST)
1.92 +
1.93 export_product:
1.94 - $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
1.95 - generic_export
1.96 + $(MAKE) BUILD_FLAVOR=$(@:export_%=%) generic_export
1.97 export_fastdebug:
1.98 - $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
1.99 - EXPORT_SUBDIR=/$(@:export_%=%) \
1.100 - generic_export
1.101 + $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
1.102 export_debug:
1.103 - $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
1.104 - EXPORT_SUBDIR=/$(@:export_%=%) \
1.105 - generic_export
1.106 + $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
1.107 export_optimized:
1.108 - $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
1.109 - EXPORT_SUBDIR=/$(@:export_%=%) \
1.110 - generic_export
1.111 + $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
1.112 +
1.113 export_product_jdk::
1.114 - $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
1.115 - VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
1.116 - generic_export
1.117 + $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) generic_export
1.118 export_optimized_jdk::
1.119 - $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
1.120 - VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
1.121 - generic_export
1.122 + $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) generic_export
1.123 export_fastdebug_jdk::
1.124 - $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
1.125 - VM_SUBDIR=$(@:export_%_jdk=%) \
1.126 - ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
1.127 - generic_export
1.128 + $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export
1.129 export_debug_jdk::
1.130 - $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=$(@:export_%_jdk=%) \
1.131 - ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
1.132 - generic_export
1.133 + $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export
1.134
1.135 # Export file copy rules
1.136 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
1.137 -DOCS_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_docs
1.138 -C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1/$(VM_SUBDIR)
1.139 -C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2/$(VM_SUBDIR)
1.140 -MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1/$(VM_SUBDIR)
1.141 -ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero/$(VM_SUBDIR)
1.142 -SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark/$(VM_SUBDIR)
1.143 +DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
1.144 +C1_BUILD_DIR =$(C1_DIR)/$(BUILD_FLAVOR)
1.145 +C2_BUILD_DIR =$(C2_DIR)/$(BUILD_FLAVOR)
1.146 +MINIMAL1_BUILD_DIR=$(MINIMAL1_DIR)/$(BUILD_FLAVOR)
1.147 +ZERO_BUILD_DIR =$(ZERO_DIR)/$(BUILD_FLAVOR)
1.148 +SHARK_BUILD_DIR =$(SHARK_DIR)/$(BUILD_FLAVOR)
1.149
1.150 # Server (C2)
1.151 ifeq ($(JVM_VARIANT_SERVER), true)
1.152 # Common
1.153 -$(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
1.154 +$(EXPORT_SERVER_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
1.155 $(install-file)
1.156 -$(EXPORT_LIB_DIR)/%.jar: $(C2_DIR)/../generated/%.jar
1.157 +$(EXPORT_LIB_DIR)/%.jar: $(C2_BUILD_DIR)/../generated/%.jar
1.158 $(install-file)
1.159 -$(EXPORT_INCLUDE_DIR)/%: $(C2_DIR)/../generated/jvmtifiles/%
1.160 +$(EXPORT_INCLUDE_DIR)/%: $(C2_BUILD_DIR)/../generated/jvmtifiles/%
1.161 $(install-file)
1.162 # Windows
1.163 -$(EXPORT_SERVER_DIR)/%.dll: $(C2_DIR)/%.dll
1.164 +$(EXPORT_SERVER_DIR)/%.dll: $(C2_BUILD_DIR)/%.dll
1.165 $(install-file)
1.166 -$(EXPORT_SERVER_DIR)/%.pdb: $(C2_DIR)/%.pdb
1.167 +$(EXPORT_SERVER_DIR)/%.pdb: $(C2_BUILD_DIR)/%.pdb
1.168 $(install-file)
1.169 -$(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map
1.170 +$(EXPORT_SERVER_DIR)/%.map: $(C2_BUILD_DIR)/%.map
1.171 $(install-file)
1.172 -$(EXPORT_LIB_DIR)/%.lib: $(C2_DIR)/%.lib
1.173 +$(EXPORT_LIB_DIR)/%.lib: $(C2_BUILD_DIR)/%.lib
1.174 $(install-file)
1.175 -$(EXPORT_JRE_BIN_DIR)/%.diz: $(C2_DIR)/%.diz
1.176 +$(EXPORT_JRE_BIN_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
1.177 $(install-file)
1.178 -$(EXPORT_JRE_BIN_DIR)/%.dll: $(C2_DIR)/%.dll
1.179 +$(EXPORT_JRE_BIN_DIR)/%.dll: $(C2_BUILD_DIR)/%.dll
1.180 $(install-file)
1.181 -$(EXPORT_JRE_BIN_DIR)/%.pdb: $(C2_DIR)/%.pdb
1.182 +$(EXPORT_JRE_BIN_DIR)/%.pdb: $(C2_BUILD_DIR)/%.pdb
1.183 $(install-file)
1.184 -$(EXPORT_JRE_BIN_DIR)/%.map: $(C2_DIR)/%.map
1.185 +$(EXPORT_JRE_BIN_DIR)/%.map: $(C2_BUILD_DIR)/%.map
1.186 $(install-file)
1.187 # Unix
1.188 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
1.189 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.190 $(install-file)
1.191 -$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
1.192 +$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.193 $(install-file)
1.194 -$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
1.195 +$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.196 $(install-file)
1.197 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
1.198 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_BUILD_DIR)/%.debuginfo
1.199 $(install-file)
1.200 -$(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
1.201 +$(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_BUILD_DIR)/%.debuginfo
1.202 $(install-file)
1.203 -$(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
1.204 +$(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_BUILD_DIR)/%.debuginfo
1.205 $(install-file)
1.206 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz
1.207 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
1.208 $(install-file)
1.209 -$(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz
1.210 +$(EXPORT_SERVER_DIR)/64/%.diz: $(C2_BUILD_DIR)/%.diz
1.211 $(install-file)
1.212 endif
1.213
1.214 # Client (C1)
1.215 ifeq ($(JVM_VARIANT_CLIENT), true)
1.216 # Common
1.217 -$(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
1.218 +$(EXPORT_CLIENT_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz
1.219 $(install-file)
1.220 -$(EXPORT_LIB_DIR)/%.jar: $(C1_DIR)/../generated/%.jar
1.221 +$(EXPORT_LIB_DIR)/%.jar: $(C1_BUILD_DIR)/../generated/%.jar
1.222 $(install-file)
1.223 -$(EXPORT_INCLUDE_DIR)/%: $(C1_DIR)/../generated/jvmtifiles/%
1.224 +$(EXPORT_INCLUDE_DIR)/%: $(C1_BUILD_DIR)/../generated/jvmtifiles/%
1.225 $(install-file)
1.226 # Windows
1.227 -$(EXPORT_CLIENT_DIR)/%.dll: $(C1_DIR)/%.dll
1.228 +$(EXPORT_CLIENT_DIR)/%.dll: $(C1_BUILD_DIR)/%.dll
1.229 $(install-file)
1.230 -$(EXPORT_CLIENT_DIR)/%.pdb: $(C1_DIR)/%.pdb
1.231 +$(EXPORT_CLIENT_DIR)/%.pdb: $(C1_BUILD_DIR)/%.pdb
1.232 $(install-file)
1.233 -$(EXPORT_CLIENT_DIR)/%.map: $(C1_DIR)/%.map
1.234 +$(EXPORT_CLIENT_DIR)/%.map: $(C1_BUILD_DIR)/%.map
1.235 $(install-file)
1.236 -$(EXPORT_LIB_DIR)/%.lib: $(C1_DIR)/%.lib
1.237 +$(EXPORT_LIB_DIR)/%.lib: $(C1_BUILD_DIR)/%.lib
1.238 $(install-file)
1.239 -$(EXPORT_JRE_BIN_DIR)/%.diz: $(C1_DIR)/%.diz
1.240 +$(EXPORT_JRE_BIN_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz
1.241 $(install-file)
1.242 -$(EXPORT_JRE_BIN_DIR)/%.dll: $(C1_DIR)/%.dll
1.243 +$(EXPORT_JRE_BIN_DIR)/%.dll: $(C1_BUILD_DIR)/%.dll
1.244 $(install-file)
1.245 -$(EXPORT_JRE_BIN_DIR)/%.pdb: $(C1_DIR)/%.pdb
1.246 +$(EXPORT_JRE_BIN_DIR)/%.pdb: $(C1_BUILD_DIR)/%.pdb
1.247 $(install-file)
1.248 -$(EXPORT_JRE_BIN_DIR)/%.map: $(C1_DIR)/%.map
1.249 +$(EXPORT_JRE_BIN_DIR)/%.map: $(C1_BUILD_DIR)/%.map
1.250 $(install-file)
1.251 # Unix
1.252 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
1.253 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.254 $(install-file)
1.255 -$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
1.256 +$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.257 $(install-file)
1.258 -$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
1.259 +$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.260 $(install-file)
1.261 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
1.262 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_BUILD_DIR)/%.debuginfo
1.263 $(install-file)
1.264 -$(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
1.265 +$(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_BUILD_DIR)/%.debuginfo
1.266 $(install-file)
1.267 -$(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
1.268 +$(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_BUILD_DIR)/%.debuginfo
1.269 $(install-file)
1.270 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz
1.271 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz
1.272 $(install-file)
1.273 -$(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz
1.274 +$(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_BUILD_DIR)/%.diz
1.275 $(install-file)
1.276 endif
1.277
1.278 # Minimal1
1.279 ifeq ($(JVM_VARIANT_MINIMAL1), true)
1.280 # Common
1.281 -$(EXPORT_MINIMAL_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
1.282 +$(EXPORT_MINIMAL_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
1.283 $(install-file)
1.284 -$(EXPORT_LIB_DIR)/%.jar: $(MINIMAL1_DIR)/../generated/%.jar
1.285 +$(EXPORT_LIB_DIR)/%.jar: $(MINIMAL1_BUILD_DIR)/../generated/%.jar
1.286 $(install-file)
1.287 -$(EXPORT_INCLUDE_DIR)/%: $(MINIMAL1_DIR)/../generated/jvmtifiles/%
1.288 +$(EXPORT_INCLUDE_DIR)/%: $(MINIMAL1_BUILD_DIR)/../generated/jvmtifiles/%
1.289 $(install-file)
1.290 # Windows
1.291 -$(EXPORT_MINIMAL_DIR)/%.dll: $(MINIMAL1_DIR)/%.dll
1.292 +$(EXPORT_MINIMAL_DIR)/%.dll: $(MINIMAL1_BUILD_DIR)/%.dll
1.293 $(install-file)
1.294 -$(EXPORT_MINIMAL_DIR)/%.pdb: $(MINIMAL1_DIR)/%.pdb
1.295 +$(EXPORT_MINIMAL_DIR)/%.pdb: $(MINIMAL1_BUILD_DIR)/%.pdb
1.296 $(install-file)
1.297 -$(EXPORT_MINIMAL_DIR)/%.map: $(MINIMAL1_DIR)/%.map
1.298 +$(EXPORT_MINIMAL_DIR)/%.map: $(MINIMAL1_BUILD_DIR)/%.map
1.299 $(install-file)
1.300 -$(EXPORT_LIB_DIR)/%.lib: $(MINIMAL1_DIR)/%.lib
1.301 +$(EXPORT_LIB_DIR)/%.lib: $(MINIMAL1_BUILD_DIR)/%.lib
1.302 $(install-file)
1.303 -$(EXPORT_JRE_BIN_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
1.304 +$(EXPORT_JRE_BIN_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
1.305 $(install-file)
1.306 -$(EXPORT_JRE_BIN_DIR)/%.dll: $(MINIMAL1_DIR)/%.dll
1.307 +$(EXPORT_JRE_BIN_DIR)/%.dll: $(MINIMAL1_BUILD_DIR)/%.dll
1.308 $(install-file)
1.309 -$(EXPORT_JRE_BIN_DIR)/%.pdb: $(MINIMAL1_DIR)/%.pdb
1.310 +$(EXPORT_JRE_BIN_DIR)/%.pdb: $(MINIMAL1_BUILD_DIR)/%.pdb
1.311 $(install-file)
1.312 -$(EXPORT_JRE_BIN_DIR)/%.map: $(MINIMAL1_DIR)/%.map
1.313 +$(EXPORT_JRE_BIN_DIR)/%.map: $(MINIMAL1_BUILD_DIR)/%.map
1.314 $(install-file)
1.315 # Unix
1.316 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
1.317 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.318 $(install-file)
1.319 -$(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
1.320 +$(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.321 $(install-file)
1.322 -$(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
1.323 +$(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX): $(MINIMAL1_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.324 $(install-file)
1.325 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
1.326 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(MINIMAL1_BUILD_DIR)/%.debuginfo
1.327 $(install-file)
1.328 -$(EXPORT_MINIMAL_DIR)/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
1.329 +$(EXPORT_MINIMAL_DIR)/%.debuginfo: $(MINIMAL1_BUILD_DIR)/%.debuginfo
1.330 $(install-file)
1.331 -$(EXPORT_MINIMAL_DIR)/64/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
1.332 +$(EXPORT_MINIMAL_DIR)/64/%.debuginfo: $(MINIMAL1_BUILD_DIR)/%.debuginfo
1.333 $(install-file)
1.334 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
1.335 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
1.336 $(install-file)
1.337 -$(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_DIR)/%.diz
1.338 +$(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
1.339 $(install-file)
1.340 endif
1.341
1.342 # Zero
1.343 ifeq ($(JVM_VARIANT_ZERO), true)
1.344 # Common
1.345 -$(EXPORT_LIB_DIR)/%.jar: $(ZERO_DIR)/../generated/%.jar
1.346 +$(EXPORT_LIB_DIR)/%.jar: $(ZERO_BUILD_DIR)/../generated/%.jar
1.347 $(install-file)
1.348 -$(EXPORT_INCLUDE_DIR)/%: $(ZERO_DIR)/../generated/jvmtifiles/%
1.349 +$(EXPORT_INCLUDE_DIR)/%: $(ZERO_BUILD_DIR)/../generated/jvmtifiles/%
1.350 $(install-file)
1.351 # Unix
1.352 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
1.353 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.354 $(install-file)
1.355 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(ZERO_DIR)/%.debuginfo
1.356 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo
1.357 $(install-file)
1.358 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(ZERO_DIR)/%.diz
1.359 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz
1.360 $(install-file)
1.361 -$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
1.362 +$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.363 $(install-file)
1.364 -$(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_DIR)/%.debuginfo
1.365 +$(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo
1.366 $(install-file)
1.367 -$(EXPORT_SERVER_DIR)/%.diz: $(ZERO_DIR)/%.diz
1.368 +$(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz
1.369 $(install-file)
1.370 endif
1.371
1.372 # Shark
1.373 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
1.374 # Common
1.375 -$(EXPORT_LIB_DIR)/%.jar: $(SHARK_DIR)/../generated/%.jar
1.376 +$(EXPORT_LIB_DIR)/%.jar: $(SHARK_BUILD_DIR)/../generated/%.jar
1.377 $(install-file)
1.378 -$(EXPORT_INCLUDE_DIR)/%: $(SHARK_DIR)/../generated/jvmtifiles/%
1.379 +$(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD_DIR)/../generated/jvmtifiles/%
1.380 $(install-file)
1.381 # Unix
1.382 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
1.383 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.384 $(install-file)
1.385 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo): $(SHARK_DIR)/%.debuginfo
1.386 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo): $(SHARK_BUILD_DIR)/%.debuginfo
1.387 $(install-file)
1.388 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_DIR)/%.diz
1.389 +$(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz
1.390 $(install-file)
1.391 -$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
1.392 +$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
1.393 $(install-file)
1.394 -$(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_DIR)/%.debuginfo
1.395 +$(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_BUILD_DIR)/%.debuginfo
1.396 $(install-file)
1.397 -$(EXPORT_SERVER_DIR)/%.diz: $(SHARK_DIR)/%.diz
1.398 +$(EXPORT_SERVER_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz
1.399 $(install-file)
1.400 endif
1.401
