1.1 --- a/make/solaris/makefiles/defs.make Thu Sep 22 16:48:41 2011 +0100
1.2 +++ b/make/solaris/makefiles/defs.make Fri Sep 30 13:48:17 2011 -0700
1.3 @@ -134,13 +134,16 @@
1.4
1.5 JDK_INCLUDE_SUBDIR=solaris
1.6
1.7 +# Library suffix
1.8 +LIBRARY_SUFFIX=so
1.9 +
1.10 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
1.11 VM_DEBUG=jvmg
1.12
1.13 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
1.14
1.15 -# client and server subdirectories have symbolic links to ../libjsig.so
1.16 -EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
1.17 +# client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX)
1.18 +EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
1.19 ifneq ($(OBJCOPY),)
1.20 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
1.21 endif
1.22 @@ -150,9 +153,9 @@
1.23
1.24 ifneq ($(BUILD_CLIENT_ONLY),true)
1.25 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
1.26 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
1.27 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.so
1.28 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.so
1.29 +EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
1.30 +EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
1.31 +EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
1.32 ifneq ($(OBJCOPY),)
1.33 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
1.34 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo
1.35 @@ -161,21 +164,21 @@
1.36 endif
1.37 ifeq ($(ARCH_DATA_MODEL), 32)
1.38 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
1.39 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
1.40 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so
1.41 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so
1.42 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so
1.43 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so
1.44 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
1.45 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
1.46 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
1.47 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
1.48 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
1.49 ifneq ($(OBJCOPY),)
1.50 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
1.51 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo
1.52 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
1.53 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo
1.54 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo
1.55 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo
1.56 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo
1.57 endif
1.58 ifneq ($(BUILD_CLIENT_ONLY), true)
1.59 - EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so
1.60 - EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so
1.61 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
1.62 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
1.63 ifneq ($(OBJCOPY),)
1.64 EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo
1.65 EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo
1.66 @@ -183,7 +186,7 @@
1.67 endif
1.68 endif
1.69
1.70 -EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
1.71 +EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX)
1.72 ifneq ($(OBJCOPY),)
1.73 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
1.74 endif
