Index: /trunk/openjdk/jdk/make/Makefile
===================================================================
--- /trunk/openjdk/jdk/make/Makefile	(revision 143)
+++ /trunk/openjdk/jdk/make/Makefile	(revision 144)
@@ -260,5 +260,9 @@
 all build:: sanity-all post-sanity-all
 
+ifndef OS2_TEMP
 SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
+else
+SUBDIRS    = tools java org sun sunw com launchers
+endif
 all build::
 	$(SUBDIRS-loop)
Index: /trunk/openjdk/jdk/make/com/sun/Makefile
===================================================================
--- /trunk/openjdk/jdk/make/com/sun/Makefile	(revision 143)
+++ /trunk/openjdk/jdk/make/com/sun/Makefile	(revision 144)
@@ -40,7 +40,13 @@
 
 # Omit mirror since it's built with the apt tool.
+ifndef OS2_TEMP # security
 SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
     java inputmethods org rowset net/httpserver net/ssl demo \
     tools jarsigner
+else
+SUBDIRS = $(SCRIPT_SUBDIR) jndi jmx \
+    java org rowset net/httpserver demo \
+    jarsigner
+endif
 
 all build clean clobber::
Index: /trunk/openjdk/jdk/make/common/Release.gmk
===================================================================
--- /trunk/openjdk/jdk/make/common/Release.gmk	(revision 143)
+++ /trunk/openjdk/jdk/make/common/Release.gmk	(revision 144)
@@ -337,6 +337,12 @@
 #
 TOOLS = \
+
+ifndef OS2_TEMP # security
+TOOLS += \
 	META-INF/services/com.sun.jdi.connect.Connector \
 	META-INF/services/com.sun.jdi.connect.spi.TransportService \
+
+endif
+TOOLS += \
 	sun/tools/asm		\
 	sun/tools/jar		\
@@ -351,4 +357,7 @@
 	sun/tools/tree		\
 	sun/tools/util		\
+
+ifndef OS2_TEMP # security
+TOOLS += \
 	sun/security/tools/JarBASE64Encoder.class \
 	sun/security/tools/JarSigner.class \
@@ -360,16 +369,31 @@
 	sun/security/tools/SignatureFile.class \
 	sun/security/tools/TimestampedSigner.class \
+
+endif
+TOOLS += \
 	sun/rmi/rmic		\
 	sun/applet		\
 	sun/jvmstat		\
 	com/sun/javadoc		\
+
+ifndef OS2_TEMP # JPDA
+TOOLS += \
 	com/sun/jdi		\
+
+endif
+TOOLS += \
 	com/sun/jarsigner	\
 	com/sun/mirror		\
 	com/sun/source          \
 	com/sun/tools/doclets   \
+
+ifndef OS2_TEMP # JPDA
+TOOLS += \
 	com/sun/tools/example/debug/expr \
 	com/sun/tools/example/debug/tty  \
 	com/sun/tools/extcheck  \
+
+endif
+TOOLS += \
 	com/sun/tools/hat       \
 	com/sun/tools/javac     \
@@ -390,9 +414,21 @@
         org/relaxng/datatype   \
 	com/sun/xml/internal/dtdparser \
+
+ifndef OS2_TEMP # JPDA
+TOOLS += \
 	com/sun/tools/jdi	\
+
+endif
+TOOLS += \
 	com/sun/tools/script/shell	\
+
+ifndef OS2_TEMP # com.sun.tools.attach
+TOOLS += \
 	META-INF/services/com.sun.tools.attach.spi.AttachProvider \
 	com/sun/tools/attach	\
 	sun/tools/attach	\
+
+endif
+TOOLS += \
 	sun/tools/jstack        \
 	sun/tools/jinfo         \
@@ -660,4 +696,5 @@
 	@$(java-vm-cleanup)
 
+ifndef OS2_TEMP # security
 # Create jsse.jar containing SunJSSE implementation classes
 JSSE_JAR=$(TEMPDIR)/jsse-orig.jar
@@ -668,4 +705,5 @@
 		$(JAR_JFLAGS)
 	@$(java-vm-cleanup)
+endif
 
 # Create sec-bin.zip
@@ -776,5 +814,7 @@
 	$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
 	$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
+ifndef OS2_TEMP # security	
 	$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
+endif
 	@# Generate meta-index to make boot and extension class loaders lazier
 	$(CD) $(JRE_IMAGE_DIR)/lib && \
@@ -911,5 +951,7 @@
 	@#
 	$(CP) $(LIBDIR)/$(LIB_PREFIX)jvm.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
+ifndef OS2_TEMP
 	$(CP) $(LIBDIR)/$(LIB_PREFIX)jawt.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
+endif
 	@#
 	@# bin/
@@ -980,5 +1022,5 @@
 	@# So for Linux, make use of the -T option (like Solaris' -I option) of
 	@# obtaining the list of files from a file. MKS tar has no such option.
-  ifeq ($(PLATFORM), linux)
+  ifeq ($(filter-out linux os2, $(PLATFORM)),)
 	for d in $(SOURCE_DIRS); do \
 	  $(RM) $(ABS_TEMPDIR)/src-files.list; \
@@ -1037,4 +1079,5 @@
 	@# demo, include
 	@#
+ifndef OS2_TEMP
 	$(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
 	$(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
@@ -1044,4 +1087,5 @@
 	@#
 	$(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
+endif
 ifneq ($(filter-out windows os2, $(PLATFORM)),)
 	$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
Index: /trunk/openjdk/jdk/make/sun/Makefile
===================================================================
--- /trunk/openjdk/jdk/make/sun/Makefile	(revision 143)
+++ /trunk/openjdk/jdk/make/sun/Makefile	(revision 144)
@@ -62,4 +62,5 @@
   RENDER_SUBDIR = dcpr
 endif
+ifndef OS2_TEMP # security, GUI stuff
 SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \
 	  awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \
@@ -68,4 +69,10 @@
 	  jawt text nio launcher management $(ORG_SUBDIR) \
           native2ascii serialver tools jconsole
+else
+SUBDIRS = jar javazic misc net \
+	  rmi beans $(JDBC_SUBDIR) \
+	  text nio launcher management $(ORG_SUBDIR) \
+          native2ascii serialver tools jconsole
+endif
 
 all build clean clobber::
Index: /trunk/openjdk/jdk/make/sun/net/FILES_java.gmk
===================================================================
--- /trunk/openjdk/jdk/make/sun/net/FILES_java.gmk	(revision 143)
+++ /trunk/openjdk/jdk/make/sun/net/FILES_java.gmk	(revision 144)
@@ -88,4 +88,7 @@
 	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 \
@@ -94,4 +97,7 @@
 	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 \
