comparison make/lib/SecurityLibraries.gmk @ 9190:6210b60a16ea

Merge
author kvn
date Thu, 05 Dec 2013 15:10:36 -0800
parents makefiles/lib/SecurityLibraries.gmk@d152c5b01ea8 makefiles/lib/SecurityLibraries.gmk@4be14673b9bf
children ec7671728ca5
comparison
equal deleted inserted replaced
2:0d454f5ffeb1 2:4dedca6827d6
26 LIBJAAS_MAPFILE := 26 LIBJAAS_MAPFILE :=
27 ifneq ($(OPENJDK_TARGET_OS), solaris) 27 ifneq ($(OPENJDK_TARGET_OS), solaris)
28 LIBJAAS_EXCLUDE_FILES := Solaris.c 28 LIBJAAS_EXCLUDE_FILES := Solaris.c
29 else 29 else
30 # only on solaris...wonder why 30 # only on solaris...wonder why
31 LIBJAAS_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjaas/mapfile-vers 31 LIBJAAS_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjaas/mapfile-vers
32 endif 32 endif
33 33
34 LIBJAAS_NAME := jaas_unix 34 LIBJAAS_NAME := jaas_unix
35 ifeq ($(OPENJDK_TARGET_OS), windows) 35 ifeq ($(OPENJDK_TARGET_OS), windows)
36 LIBJAAS_NAME := jaas_nt 36 LIBJAAS_NAME := jaas_nt
74 OPTIMIZATION := LOW, \ 74 OPTIMIZATION := LOW, \
75 CFLAGS := $(CFLAGS_JDKLIB) \ 75 CFLAGS := $(CFLAGS_JDKLIB) \
76 -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \ 76 -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
77 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio \ 77 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio \
78 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE, \ 78 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE, \
79 MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pcsc/mapfile-vers, \ 79 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pcsc/mapfile-vers, \
80 LDFLAGS := $(LDFLAGS_JDKLIB) \ 80 LDFLAGS := $(LDFLAGS_JDKLIB) \
81 $(call SET_SHARED_LIBRARY_ORIGIN), \ 81 $(call SET_SHARED_LIBRARY_ORIGIN), \
82 LDFLAGS_SUFFIX_posix := $(LIBDL), \ 82 LDFLAGS_SUFFIX_posix := $(LIBDL), \
83 LDFLAGS_SUFFIX_windows := winscard.lib, \ 83 LDFLAGS_SUFFIX_windows := winscard.lib, \
84 LDFLAGS_SUFFIX_solaris := -lc, \ 84 LDFLAGS_SUFFIX_solaris := -lc, \
103 LANG := C, \ 103 LANG := C, \
104 OPTIMIZATION := LOW, \ 104 OPTIMIZATION := LOW, \
105 CFLAGS := $(CFLAGS_JDKLIB) \ 105 CFLAGS := $(CFLAGS_JDKLIB) \
106 -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \ 106 -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
107 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \ 107 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
108 MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \ 108 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \
109 LDFLAGS := $(LDFLAGS_JDKLIB) \ 109 LDFLAGS := $(LDFLAGS_JDKLIB) \
110 $(call SET_SHARED_LIBRARY_ORIGIN), \ 110 $(call SET_SHARED_LIBRARY_ORIGIN), \
111 LDFLAGS_SUFFIX := $(LIBDL), \ 111 LDFLAGS_SUFFIX := $(LIBDL), \
112 LDFLAGS_SUFFIX_solaris := -lc, \ 112 LDFLAGS_SUFFIX_solaris := -lc, \
113 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \ 113 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \
197 CFLAGS := $(CFLAGS_JDKLIB) \ 197 CFLAGS := $(CFLAGS_JDKLIB) \
198 -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \ 198 -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
199 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \ 199 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
200 -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \ 200 -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
201 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \ 201 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
202 MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pkcs11/mapfile-vers, \ 202 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \
203 LDFLAGS := $(LDFLAGS_JDKLIB) \ 203 LDFLAGS := $(LDFLAGS_JDKLIB) \
204 $(call SET_SHARED_LIBRARY_ORIGIN), \ 204 $(call SET_SHARED_LIBRARY_ORIGIN), \
205 LDFLAGS_SUFFIX_posix := $(LIBDL), \ 205 LDFLAGS_SUFFIX_posix := $(LIBDL), \
206 LDFLAGS_SUFFIX_solaris := -lc, \ 206 LDFLAGS_SUFFIX_solaris := -lc, \
207 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ 207 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
242 CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \ 242 CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
243 $(BUILD_LIBSUNEC_FLAGS) \ 243 $(BUILD_LIBSUNEC_FLAGS) \
244 -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \ 244 -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
245 CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \ 245 CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
246 $(BUILD_LIBSUNEC_FLAGS), \ 246 $(BUILD_LIBSUNEC_FLAGS), \
247 MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsunec/mapfile-vers, \ 247 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
248 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ 248 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
249 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \ 249 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
250 LDFLAGS_SUFFIX := $(LIBCXX), \ 250 LDFLAGS_SUFFIX := $(LIBCXX), \
251 LDFLAGS_SUFFIX_linux := -lc, \ 251 LDFLAGS_SUFFIX_linux := -lc, \
252 LDFLAGS_SUFFIX_solaris := -lc, \ 252 LDFLAGS_SUFFIX_solaris := -lc, \
272 SRC := $(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \ 272 SRC := $(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
273 LANG := C, \ 273 LANG := C, \
274 OPTIMIZATION := LOW, \ 274 OPTIMIZATION := LOW, \
275 CFLAGS := $(CFLAGS_JDKLIB) \ 275 CFLAGS := $(CFLAGS_JDKLIB) \
276 -I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \ 276 -I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
277 MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \ 277 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2ucrypto/mapfile-vers, \
278 LDFLAGS := $(LDFLAGS_JDKLIB), \ 278 LDFLAGS := $(LDFLAGS_JDKLIB), \
279 LDFLAGS_SUFFIX := $(LIBDL), \ 279 LDFLAGS_SUFFIX := $(LIBDL), \
280 LDFLAGS_SUFFIX_solaris := -lc, \ 280 LDFLAGS_SUFFIX_solaris := -lc, \
281 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \ 281 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \
282 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) 282 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))