comparison make/Makefile @ 14422:2b8e28fdf503

Merge
author kvn
date Tue, 05 Nov 2013 17:38:04 -0800
parents faf0c78e906b f509b8f4699b
children 8a9bb7821e28 fe392af93c23
comparison
equal deleted inserted replaced
14421:3068270ba476 14422:2b8e28fdf503
359 $(install-file) 359 $(install-file)
360 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz 360 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_BUILD_DIR)/%.diz
361 $(install-file) 361 $(install-file)
362 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_BUILD_DIR)/%.diz 362 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_BUILD_DIR)/%.diz
363 $(install-file) 363 $(install-file)
364 # MacOS X
365 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM
366 $(install-dir)
367 $(EXPORT_SERVER_DIR)/%.dSYM: $(C2_BUILD_DIR)/%.dSYM
368 $(install-dir)
364 endif 369 endif
365 370
366 # Client (C1) 371 # Client (C1)
367 ifeq ($(JVM_VARIANT_CLIENT), true) 372 ifeq ($(JVM_VARIANT_CLIENT), true)
368 # Common 373 # Common
404 $(install-file) 409 $(install-file)
405 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz 410 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_BUILD_DIR)/%.diz
406 $(install-file) 411 $(install-file)
407 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_BUILD_DIR)/%.diz 412 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_BUILD_DIR)/%.diz
408 $(install-file) 413 $(install-file)
414 # MacOS X
415 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(C1_BUILD_DIR)/%.dSYM
416 $(install-dir)
417 $(EXPORT_CLIENT_DIR)/%.dSYM: $(C1_BUILD_DIR)/%.dSYM
418 $(install-dir)
409 endif 419 endif
410 420
411 # Minimal1 421 # Minimal1
412 ifeq ($(JVM_VARIANT_MINIMAL1), true) 422 ifeq ($(JVM_VARIANT_MINIMAL1), true)
413 # Common 423 # Common
449 $(install-file) 459 $(install-file)
450 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz 460 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
451 $(install-file) 461 $(install-file)
452 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz 462 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_BUILD_DIR)/%.diz
453 $(install-file) 463 $(install-file)
464 # MacOS X does not support Minimal1 config
454 endif 465 endif
455 466
456 # Zero 467 # Zero
457 ifeq ($(JVM_VARIANT_ZERO), true) 468 ifeq ($(JVM_VARIANT_ZERO), true)
458 # Common 469 # Common
471 $(install-file) 482 $(install-file)
472 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo 483 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_BUILD_DIR)/%.debuginfo
473 $(install-file) 484 $(install-file)
474 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz 485 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_BUILD_DIR)/%.diz
475 $(install-file) 486 $(install-file)
487 # MacOS X
488 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM
489 $(install-dir)
490 $(EXPORT_SERVER_DIR)/%.dSYM: $(ZERO_BUILD_DIR)/%.dSYM
491 $(install-dir)
476 endif 492 endif
477 493
478 # Core 494 # Core
479 ifeq ($(JVM_VARIANT_CORE), true) 495 ifeq ($(JVM_VARIANT_CORE), true)
480 # Common 496 # Common
515 $(install-file) 531 $(install-file)
516 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_BUILD_DIR)/%.debuginfo 532 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_BUILD_DIR)/%.debuginfo
517 $(install-file) 533 $(install-file)
518 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz 534 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz
519 $(install-file) 535 $(install-file)
536 # MacOS X
537 $(EXPORT_JRE_LIB_ARCH_DIR)/%.dSYM: $(SHARK_BUILD_DIR)/%.dSYM
538 $(install-dir)
539 $(EXPORT_SERVER_DIR)/%.dSYM: $(SHARK_BUILD_DIR)/%.dSYM
540 $(install-dir)
520 endif 541 endif
521 542
522 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% 543 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
523 $(install-file) 544 $(install-file)
524 545