equal
deleted
inserted
replaced
332 $(install-file) |
332 $(install-file) |
333 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz |
333 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz |
334 $(install-file) |
334 $(install-file) |
335 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_BUILD_DIR)/%.diz |
335 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_BUILD_DIR)/%.diz |
336 $(install-file) |
336 $(install-file) |
|
337 # MacOS X |
|
338 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM |
|
339 $(install-dir) |
|
340 $(EXPORT_SERVER_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM |
|
341 $(install-dir) |
337 endif |
342 endif |
338 |
343 |
339 # Client (C1) |
344 # Client (C1) |
340 ifeq ($(JVM_VARIANT_CLIENT), true) |
345 ifeq ($(JVM_VARIANT_CLIENT), true) |
341 # Common |
346 # Common |
377 $(install-file) |
382 $(install-file) |
378 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz |
383 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz |
379 $(install-file) |
384 $(install-file) |
380 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_BUILD_DIR)/%.diz |
385 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_BUILD_DIR)/%.diz |
381 $(install-file) |
386 $(install-file) |
|
387 # MacOS X |
|
388 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(C1_BUILD_DIR)/%.dSYM |
|
389 $(install-dir) |
|
390 $(EXPORT_CLIENT_DIR)/%.dSYM: $(C1_BUILD_DIR)/%.dSYM |
|
391 $(install-dir) |
382 endif |
392 endif |
383 |
393 |
384 # Minimal1 |
394 # Minimal1 |
385 ifeq ($(JVM_VARIANT_MINIMAL1), true) |
395 ifeq ($(JVM_VARIANT_MINIMAL1), true) |
386 # Common |
396 # Common |
422 $(install-file) |
432 $(install-file) |
423 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz |
433 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz |
424 $(install-file) |
434 $(install-file) |
425 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz |
435 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz |
426 $(install-file) |
436 $(install-file) |
|
437 # MacOS X does not support Minimal1 config |
427 endif |
438 endif |
428 |
439 |
429 # Zero |
440 # Zero |
430 ifeq ($(JVM_VARIANT_ZERO), true) |
441 ifeq ($(JVM_VARIANT_ZERO), true) |
431 # Common |
442 # Common |
444 $(install-file) |
455 $(install-file) |
445 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo |
456 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo |
446 $(install-file) |
457 $(install-file) |
447 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz |
458 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz |
448 $(install-file) |
459 $(install-file) |
|
460 # MacOS X |
|
461 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM |
|
462 $(install-dir) |
|
463 $(EXPORT_SERVER_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM |
|
464 $(install-dir) |
449 endif |
465 endif |
450 |
466 |
451 # Shark |
467 # Shark |
452 ifeq ($(JVM_VARIANT_ZEROSHARK), true) |
468 ifeq ($(JVM_VARIANT_ZEROSHARK), true) |
453 # Common |
469 # Common |
466 $(install-file) |
482 $(install-file) |
467 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_BUILD_DIR)/%.debuginfo |
483 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_BUILD_DIR)/%.debuginfo |
468 $(install-file) |
484 $(install-file) |
469 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz |
485 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz |
470 $(install-file) |
486 $(install-file) |
|
487 # MacOS X |
|
488 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(SHARK_BUILD_DIR)/%.dSYM |
|
489 $(install-dir) |
|
490 $(EXPORT_SERVER_DIR)/%.dSYM: $(SHARK_BUILD_DIR)/%.dSYM |
|
491 $(install-dir) |
471 endif |
492 endif |
472 |
493 |
473 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% |
494 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% |
474 $(install-file) |
495 $(install-file) |
475 |
496 |