321 |
321 |
322 # Shared Library |
322 # Shared Library |
323 ifneq ($(OSNAME),windows) |
323 ifneq ($(OSNAME),windows) |
324 ifeq ($(ZERO_BUILD), true) |
324 ifeq ($(ZERO_BUILD), true) |
325 ifeq ($(SHARK_BUILD), true) |
325 ifeq ($(SHARK_BUILD), true) |
326 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so |
326 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) |
327 $(install-file) |
327 $(install-file) |
328 $(EXPORT_SERVER_DIR)/%.so: $(SHARK_DIR)/%.so |
328 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) |
329 $(install-file) |
329 $(install-file) |
330 else |
330 else |
331 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so |
331 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) |
332 $(install-file) |
332 $(install-file) |
333 $(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so |
333 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) |
334 $(install-file) |
334 $(install-file) |
335 endif |
335 endif |
336 else |
336 else |
337 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C1_DIR)/%.so |
337 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) |
338 $(install-file) |
338 $(install-file) |
339 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so |
339 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) |
340 $(install-file) |
340 $(install-file) |
341 $(EXPORT_CLIENT_DIR)/%.so: $(C1_DIR)/%.so |
341 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) |
342 $(install-file) |
342 $(install-file) |
343 $(EXPORT_CLIENT_DIR)/64/%.so: $(C1_DIR)/%.so |
343 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) |
344 $(install-file) |
344 $(install-file) |
345 $(EXPORT_SERVER_DIR)/%.so: $(C2_DIR)/%.so |
345 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) |
346 $(install-file) |
346 $(install-file) |
347 $(EXPORT_SERVER_DIR)/64/%.so: $(C2_DIR)/%.so |
347 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) |
|
348 $(install-file) |
|
349 |
|
350 # Debug info for shared library |
|
351 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo |
|
352 $(install-file) |
|
353 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo |
|
354 $(install-file) |
|
355 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo |
|
356 $(install-file) |
|
357 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo |
|
358 $(install-file) |
|
359 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo |
|
360 $(install-file) |
|
361 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo |
348 $(install-file) |
362 $(install-file) |
349 endif |
363 endif |
350 endif |
364 endif |
351 |
365 |
352 # Jar file (sa-jdi.jar) |
366 # Jar file (sa-jdi.jar) |
454 else \ |
468 else \ |
455 ($(CD) $(JDK_IMPORT_PATH) && \ |
469 ($(CD) $(JDK_IMPORT_PATH) && \ |
456 $(TAR) -cf - $(JDK_DIRS)) | \ |
470 $(TAR) -cf - $(JDK_DIRS)) | \ |
457 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \ |
471 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \ |
458 fi |
472 fi |
|
473 |
|
474 # macosx universal builds |
|
475 |
|
476 ifeq ($(MACOSX_UNIVERSAL), true) |
|
477 $(UNIVERSAL_LIPO_LIST): |
|
478 lipo -create -output $@ $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) |
|
479 |
|
480 $(UNIVERSAL_COPY_LIST): |
|
481 $(CP) $(EXPORT_JRE_LIB_DIR)/i386/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) $@ |
|
482 |
|
483 universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST) |
|
484 endif |
|
485 |
|
486 universal_product: |
|
487 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_product |
|
488 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_product |
|
489 $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server} |
|
490 $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize |
|
491 |
|
492 universal_fastdebug: |
|
493 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_fastdebug |
|
494 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_fastdebug |
|
495 $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server} |
|
496 $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize |
|
497 |
|
498 universal_debug: |
|
499 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_debug |
|
500 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_debug |
|
501 $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server} |
|
502 $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize |
459 |
503 |
460 # |
504 # |
461 # Check target |
505 # Check target |
462 # |
506 # |
463 check: variable_check |
507 check: variable_check |
583 $(KERNEL_VM_TARGETS) \ |
627 $(KERNEL_VM_TARGETS) \ |
584 generic_build1 generic_build2 generic_buildkernel generic_export \ |
628 generic_build1 generic_build2 generic_buildkernel generic_export \ |
585 export_product export_fastdebug export_debug export_optimized \ |
629 export_product export_fastdebug export_debug export_optimized \ |
586 export_jdk_product export_jdk_fastdebug export_jdk_debug \ |
630 export_jdk_product export_jdk_fastdebug export_jdk_debug \ |
587 create_jdk copy_jdk update_jdk test_jdk \ |
631 create_jdk copy_jdk update_jdk test_jdk \ |
588 copy_product_jdk copy_fastdebug_jdk copy_debug_jdk |
632 copy_product_jdk copy_fastdebug_jdk copy_debug_jdk universalize \ |
589 |
633 universal_product |
|
634 |