Changeset 153 for trunk/openjdk/jdk/make/sun

Timestamp:

Sep 20, 2010, 3:05:56 PM (15 years ago)

Author:

dmik

Message:

jdk: Adopted and enabled com.security.mscapi package.

Location:

trunk/openjdk/jdk/make/sun

Files:

• Makefile (modified) (1 diff)
• net/FILES_java.gmk (modified) (2 diffs)
• security/mscapi/Makefile (modified) (1 diff)

trunk/openjdk/jdk/make/sun/Makefile

@@ -70 +70 @@
           native2ascii serialver tools jconsole
 else
-SUBDIRS = jar javazic misc net \
+SUBDIRS = jar security javazic misc net \
           rmi beans $(JDBC_SUBDIR) \
           text nio launcher management $(ORG_SUBDIR) \

trunk/openjdk/jdk/make/sun/net/FILES_java.gmk

@@ -88 +88 @@
         sun/net/www/protocol/http/NegotiatorImpl.java \
         sun/net/www/protocol/http/NegotiateCallbackHandler.java \
-
-ifndef OS2_TEMP # security
-FILES_java += \
         sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java \
         sun/net/www/protocol/https/HttpsClient.java \
@@ -97 +94 @@
         sun/net/www/protocol/https/DelegateHttpsURLConnection.java \
         sun/net/www/protocol/https/Handler.java \
-
-endif
-FILES_java += \
         sun/net/www/protocol/jar/Handler.java \
         sun/net/www/protocol/jar/URLJarFile.java \

trunk/openjdk/jdk/make/sun/security/mscapi/Makefile

@@ -158 +158 @@
 # Libraries to link
 #
-ifeq ($(filter-out windows os2, $(PLATFORM)),)
+ifeq ($(PLATFORM), windows)
   OTHER_LDLIBS += $(JVMLIB) Crypt32.Lib
+endif
+ifeq ($(PLATFORM), os2)
+  OTHER_LDLIBS += $(JVMLIB) -lCrypt32.Lib
 endif