diff --git a/jdk/make/Makefile b/jdk/make/Makefile
index 04c5a563ee719a83627d57de500d5a41debc648d..8b0b176b7d7eb9b2c5a1f3d294b9233d48ea79b8 100644
--- a/jdk/make/Makefile
+++ b/jdk/make/Makefile
@@ -240,7 +240,12 @@ import_product:
 
 all build:: sanity-all post-sanity-all
 
-SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
+SUBDIRS       = tools java javax sun com
+SUBDIRS_tools = launchers
+SUBDIRS_misc  = org sunw jpda mkdemo mksample
+
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/Makefile b/jdk/make/com/Makefile
index 1edfc3a7bec8e91080e5ff932a70618a8a4ed36c..9c42c32fc061fe028823263394e4329520d13c0d 100644
--- a/jdk/make/com/Makefile
+++ b/jdk/make/com/Makefile
@@ -32,6 +32,8 @@ PRODUCT = com
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = sun
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/Makefile b/jdk/make/com/sun/Makefile
index a6549e2a4d1296364ef1e6e6fd64baa3493351ec..c8cbd18a9e78416a13fa49e21c833988cb221e9f 100644
--- a/jdk/make/com/sun/Makefile
+++ b/jdk/make/com/sun/Makefile
@@ -38,10 +38,19 @@ ifndef OPENJDK
   endif
 endif
 
+# jarsigner is part of JRE
+SUBDIRS = java security net/ssl jarsigner
+
+SUBDIRS_management = jmx
+SUBDIRS_desktop    = image inputmethods
+SUBDIRS_enterprise = crypto/provider jndi \
+                     org xml rowset net/httpserver
+SUBDIRS_misc       = $(SCRIPT_SUBDIR) tracing servicetag nio demo
+
 # Omit mirror since it's built with the apt tool.
-SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
-    java inputmethods org xml rowset net/httpserver net/ssl demo \
-    tools jarsigner tracing servicetag nio
+SUBDIRS_tools      = tools
+
+include $(BUILDDIR)/common/Subdirs.gmk
 
 all build clean clobber::
 	$(SUBDIRS-loop)
diff --git a/jdk/make/com/sun/demo/Makefile b/jdk/make/com/sun/demo/Makefile
index 09650fe33e74d960c1d559a13bcbcb77fc226863..ac33c2385b2fc3f89e3c3cbce1059daf014c5752 100644
--- a/jdk/make/com/sun/demo/Makefile
+++ b/jdk/make/com/sun/demo/Makefile
@@ -38,6 +38,8 @@ PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = jvmti
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/demo/jvmti/Makefile b/jdk/make/com/sun/demo/jvmti/Makefile
index 6fedad20f874d6ba06848e9628f43f5dffb2cebd..5c0b4447496f3ccdfb2c977e3bf7335bd258505f 100644
--- a/jdk/make/com/sun/demo/jvmti/Makefile
+++ b/jdk/make/com/sun/demo/jvmti/Makefile
@@ -38,6 +38,8 @@ PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = hprof
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/inputmethods/Makefile b/jdk/make/com/sun/inputmethods/Makefile
index a4b7c9f97a9f3e977bef39e5b0c4a8f3997779ba..ce84f392448e56be8ff2ac7e0dbe2d9b139bcc2e 100644
--- a/jdk/make/com/sun/inputmethods/Makefile
+++ b/jdk/make/com/sun/inputmethods/Makefile
@@ -32,6 +32,8 @@ PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = indicim thaiim
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/java/Makefile b/jdk/make/com/sun/java/Makefile
index dd16695dea70ccb624b4f5d753fb650758dd835a..3f6faff597e0b15bdcb2a31d1ad4e7c5cd40263f 100644
--- a/jdk/make/com/sun/java/Makefile
+++ b/jdk/make/com/sun/java/Makefile
@@ -31,7 +31,10 @@ BUILDDIR = ../../..
 PRODUCT = plugin
 include $(BUILDDIR)/common/Defs.gmk
 
-SUBDIRS = browser pack
+SUBDIRS = pack
+SUBDIRS_misc = browser
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/java/browser/Makefile b/jdk/make/com/sun/java/browser/Makefile
index d43bbe14214afcc0cfef41547dd184dc87dc305d..148ba370827609e0c0eca47c8eca34566856b82e 100644
--- a/jdk/make/com/sun/java/browser/Makefile
+++ b/jdk/make/com/sun/java/browser/Makefile
@@ -32,6 +32,8 @@ PRODUCT = plugin
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = dom net
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/jmx/Makefile b/jdk/make/com/sun/jmx/Makefile
index 81470f0befed24d8156d9b3721727665bb62aa9d..ceff8a333d501b5050eeadb3ce2a01775d6a4fff 100644
--- a/jdk/make/com/sun/jmx/Makefile
+++ b/jdk/make/com/sun/jmx/Makefile
@@ -51,6 +51,8 @@ else
   SUBDIRS = snmp
 endif
 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build:
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/jndi/Makefile b/jdk/make/com/sun/jndi/Makefile
index 04a11126bd913bd98febcde6f384822e542c113b..204582ad5e0760e76483885afe23a6c35b5b34b2 100644
--- a/jdk/make/com/sun/jndi/Makefile
+++ b/jdk/make/com/sun/jndi/Makefile
@@ -31,6 +31,8 @@ BUILDDIR = ../../..
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = toolkit cosnaming ldap rmi dns
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/jndi/rmi/Makefile b/jdk/make/com/sun/jndi/rmi/Makefile
index eeefabf853bb43735f4275da7cac7dc7f75ca6c0..0298182beda7c6fe46527387f9fb117d79436f3a 100644
--- a/jdk/make/com/sun/jndi/rmi/Makefile
+++ b/jdk/make/com/sun/jndi/rmi/Makefile
@@ -31,6 +31,8 @@ BUILDDIR = ../../../..
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = registry
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/nio/Makefile b/jdk/make/com/sun/nio/Makefile
index 74151db7d610493f6c4d4abaeae878dae7cd1333..1d6d18affc42242dcf294c8602f4ce4865fb2b04 100644
--- a/jdk/make/com/sun/nio/Makefile
+++ b/jdk/make/com/sun/nio/Makefile
@@ -31,6 +31,8 @@ BUILDDIR = ../../..
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = sctp
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/org/Makefile b/jdk/make/com/sun/org/Makefile
index c0f1b841eb89d03b43fb351b827ec001a1c8891b..033b47d24b25e91958211b2e336f4e697ce31234 100644
--- a/jdk/make/com/sun/org/Makefile
+++ b/jdk/make/com/sun/org/Makefile
@@ -32,6 +32,8 @@ PRODUCT = org
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS =  apache
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/org/apache/Makefile b/jdk/make/com/sun/org/apache/Makefile
index 3427d05ed02f205fad606b96ea5414babd7f7098..5bd353371ae7cf291404996796627351789a5c45 100644
--- a/jdk/make/com/sun/org/apache/Makefile
+++ b/jdk/make/com/sun/org/apache/Makefile
@@ -31,6 +31,7 @@ BUILDDIR = ../../../..
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = xml
+include $(BUILDDIR)/common/Subdirs.gmk
 
 all build clean clobber::
 	$(SUBDIRS-loop)
diff --git a/jdk/make/com/sun/security/Makefile b/jdk/make/com/sun/security/Makefile
index 41df70fb42cf487a23621b2b723c96fe06659490..4fc43e4a8d87c227065e7b11f55a606c1e363fd1 100644
--- a/jdk/make/com/sun/security/Makefile
+++ b/jdk/make/com/sun/security/Makefile
@@ -30,7 +30,10 @@
 BUILDDIR = ../../..
 include $(BUILDDIR)/common/Defs.gmk
 
-SUBDIRS = jgss sasl auth auth/module
+SUBDIRS = auth
+SUBDIRS_misc = jgss sasl auth/module
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/com/sun/tools/Makefile b/jdk/make/com/sun/tools/Makefile
index be2b39c8461dc91f583975c54d7f65eeee5740a2..1187cdf80912f10bd4c82450f0df2a182bc9bbaa 100644
--- a/jdk/make/com/sun/tools/Makefile
+++ b/jdk/make/com/sun/tools/Makefile
@@ -35,6 +35,8 @@ include $(BUILDDIR)/common/Defs.gmk
 AUTO_FILES_JAVA_DIRS = com/sun/tools/extcheck
 
 SUBDIRS = attach
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build:
 	$(SUBDIRS-loop)
 clean clobber::
diff --git a/jdk/make/com/sun/tracing/Makefile b/jdk/make/com/sun/tracing/Makefile
index 166aee38db449e0bcdd4520447bf5715ff609e6c..e259902475537159989de202328bf8c4eb52f5a5 100644
--- a/jdk/make/com/sun/tracing/Makefile
+++ b/jdk/make/com/sun/tracing/Makefile
@@ -33,6 +33,8 @@ PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = dtrace
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build:
 	$(SUBDIRS-loop)
 clean clobber::
diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk
index 88a49d4443e38c2bb5cce26781dec1d80f85c2da..75077b666a86a4b5decda650950ffa4b292b31b1 100644
--- a/jdk/make/common/Defs.gmk
+++ b/jdk/make/common/Defs.gmk
@@ -576,17 +576,17 @@ endef
 define install-file
 $(prep-target)
 $(CP) $< $@
-$(install-module-file)
+@$(install-module-file)
 endef
 
 define chmod-file
 $(CHMOD) $1 $@
-$(call chmod-module-file, $1)
+@$(call chmod-module-file, $1)
 endef
 
 define install-sym-link
 $(LN) -s $1 $@
-$(call install-module-sym-link, $1)
+@$(call install-module-sym-link, $1)
 endef
 
 #
@@ -607,131 +607,9 @@ define java-vm-cleanup
 if [ -w $(HOTSPOT_LOG_NAME) ] ; then $(RM) $(HOTSPOT_LOG_NAME); fi
 endef
 
-# Default make settings for processing SUBDIRS with clobber or clean names
-SUBDIRS_MAKEFLAGS-clobber = INCREMENTAL_BUILD=false
-SUBDIRS_MAKEFLAGS-clean   = INCREMENTAL_BUILD=false
-
 # Current directory
 CURRENT_DIRECTORY := $(shell $(PWD))
 
-# If no timing wanted, we need to define these as empty
-ifdef NO_TIMING
-
-TIMING_ID:=NA
-
-define TIMING_start
-t=0:0:0:0
-endef
-
-define TIMING_end
-time_used=0
-endef
-
-else # NO_TIMING
-
-# Default timing id
-TIMING_ID:=$(shell $(BASENAME) $(CURRENT_DIRECTORY))
-
-# Timing start (must be used in same shell, e.g. same command line)
-#    Defines the shell variable $1 to have the start time.
-define TIMING_start
-$1=`$(DATE) +%j:%H:%M:%S`
-endef
-
-# Timing end (must be used in same shell, e.g. same command line)
-#    Expects shell variable $1 to have been defined as the start time.
-#    Expects shell variable $2 to have timing id string
-#    Sets total_seconds shell variable as the total seconds used.
-#    Sets time_used shell variable to contain format "%dh%dm%ds"
-define TIMING_end
-begTime="$${$1}"; \
-timing_id="$${$2}"; \
-endTime=`$(DATE) +%j:%H:%M:%S`; \
-d1=`$(ECHO) $${begTime} | $(CUT) -d':' -f1 | $(SED) -e 's@^0*@@'`; \
-if [ "$${d1}" = "" ] ; then d1=0; fi; \
-h1=`$(ECHO) $${begTime} | $(CUT) -d':' -f2 | $(SED) -e 's@^0*@@'`; \
-if [ "$${h1}" = "" ] ; then h1=0; fi; \
-m1=`$(ECHO) $${begTime} | $(CUT) -d':' -f3 | $(SED) -e 's@^0*@@'`; \
-if [ "$${m1}" = "" ] ; then m1=0; fi; \
-s1=`$(ECHO) $${begTime} | $(CUT) -d':' -f4 | $(SED) -e 's@^0*@@'`; \
-if [ "$${s1}" = "" ] ; then s1=0; fi; \
-d2=`$(ECHO) $${endTime} | $(CUT) -d':' -f1 | $(SED) -e 's@^0*@@'`; \
-if [ "$${d2}" = "" ] ; then d2=0; fi; \
-h2=`$(ECHO) $${endTime} | $(CUT) -d':' -f2 | $(SED) -e 's@^0*@@'`; \
-if [ "$${h2}" = "" ] ; then h2=0; fi; \
-m2=`$(ECHO) $${endTime} | $(CUT) -d':' -f3 | $(SED) -e 's@^0*@@'`; \
-if [ "$${m2}" = "" ] ; then m2=0; fi; \
-s2=`$(ECHO) $${endTime} | $(CUT) -d':' -f4 | $(SED) -e 's@^0*@@'`; \
-if [ "$${s2}" = "" ] ; then s2=0; fi; \
-t1_secs=`$(EXPR) $${d1} '*' 60 '*' 60 '*' 24 '+' $${h1} '*' 60 '*' 60 \
-		 '+' $${m1} '*' 60 '+' $${s1}`; \
-t2_secs=`$(EXPR) $${d2} '*' 60 '*' 60 '*' 24 '+' $${h2} '*' 60 '*' 60 \
-		 '+' $${m2} '*' 60 '+' $${s2}`; \
-total_seconds=`$(EXPR) $${t2_secs} '-' $${t1_secs}`; \
-if [ "$${total_seconds}" -lt 0 ] ; then total_seconds=0; fi; \
-t_hour=`$(EXPR) $${total_seconds} '/' '(' 60 '*' 60 ')'`h; \
-t_min=`$(EXPR) '(' $${total_seconds} '%' '(' 60 '*' 60 ')' ')' '/' 60`m; \
-t_sec=`$(EXPR) $${total_seconds} '%' 60`s; \
-time_used=$${t_sec}; \
-if [ "$${t_hour}" != "0h" ] ; then \
-time_used=$${t_hour}$${t_min}$${t_sec}; \
-elif [ "$${t_min}" != "0m" ] ; then \
-time_used=$${t_min}$${t_sec}; \
-else \
-time_used=$${t_sec}; \
-fi; \
-$(PRINTF) "  Timing: %05d seconds or %s for %s\n" \
-    $${total_seconds} $${time_used} $${timing_id}
-endef
-
-endif # NO_TIMING
-
-# Given a SUBDIRS list, cd into them and make them
-#   SUBDIRS_MAKEFLAGS      Make settings for a subdir make
-#   SUBDIRS_MAKEFLAGS-$@   Make settings specific to this target
-define SUBDIRS-loop
-@$(ECHO) "Begin Processing SUBDIRS: $(SUBDIRS)"
-@for i in DUMMY $(SUBDIRS) ; do \
-  if [ "$$i" != "DUMMY" ] ; then \
-    $(ECHO) ">>>Recursively making "$$i" "$@" @ `$(DATE)` ..."; \
-    timing_id="$(TIMING_ID)-`$(BASENAME) $${i}`"; \
-    $(call TIMING_start,startTime); \
-    curDir=$(CURRENT_DIRECTORY); \
-    $(CD) $$i; $(MAKE) $@ TIMING_ID=$${timing_id} \
-			  $(SUBDIRS_MAKEFLAGS) \
-			  $(SUBDIRS_MAKEFLAGS-$@) \
-			  FULL_VERSION=$(FULL_VERSION) \
-			  RELEASE=$(RELEASE) || exit 1; \
-	       $(CD) $${curDir}; \
-    $(call TIMING_end,startTime,timing_id); \
-    $(ECHO) "<<<Finished Recursively making "$$i" "$@" @ `$(DATE)`." ; \
-  fi ; \
-done
-@$(ECHO) "Done Processing SUBDIRS: $(SUBDIRS)"
-endef
-
-# Given a OTHERSUBDIRS list, cd into them and make them (extra loop define)
-#   OTHERSUBDIRS_MAKEFLAGS      Make settings for a subdir make
-define OTHERSUBDIRS-loop
-@$(ECHO) "Begin Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
-@for i in DUMMY $(OTHERSUBDIRS) ; do \
-  if [ "$$i" != "DUMMY" ] ; then \
-    $(ECHO) ">>>Recursively making "$$i" "$@" @ `$(DATE)` ..."; \
-    timing_id="$(TIMING_ID)-`$(BASENAME) $${i}`"; \
-    $(call TIMING_start,startTime); \
-    curDir=$(CURRENT_DIRECTORY); \
-    $(CD) $$i; $(MAKE) $@ TIMING_ID=$${timing_id} \
-		          $(OTHERSUBDIRS_MAKEFLAGS) \
-			  FULL_VERSION=$(FULL_VERSION) \
-			  RELEASE=$(RELEASE) || exit 1; \
-	       $(CD) $${curDir}; \
-    $(call TIMING_end,startTime,timing_id); \
-    $(ECHO) "<<<Finished Recursively making "$$i" "$@" @ `$(DATE)`." ; \
-  fi ; \
-done
-@$(ECHO) "Done Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
-endef
-
 #
 # Create BYFILE OPT and DBG settings, if CFLAGS_OPT/foobar.o is set then it is
 #    used for this file, otherwise the default settings are used.
@@ -819,7 +697,7 @@ endef
 
 define install-import-file
 $(install-importonly-file)
-$(install-module-file)
+@$(install-module-file)
 endef
 
 .PHONY: all build clean clobber
diff --git a/jdk/make/common/Sanity.gmk b/jdk/make/common/Sanity.gmk
index a136e6d8d34f314fe30f622b9d6492961e774e73..449dcb2358f5ddfc8975e308ab7e0c6b0afd43dd 100644
--- a/jdk/make/common/Sanity.gmk
+++ b/jdk/make/common/Sanity.gmk
@@ -71,7 +71,8 @@ sanity-base: pre-sanity \
     sane-cacerts \
     sane-ant_version \
     sane-zip_version \
-    sane-msvcrt_path
+    sane-msvcrt_path \
+    sane-build_modules
 
 # The rules sanity-* have a one-to-one correspondence with the major targets
 # Each sanity-* rule should have no body to ensure that the post-sanity-* is the
diff --git a/jdk/make/common/Subdirs.gmk b/jdk/make/common/Subdirs.gmk
new file mode 100644
index 0000000000000000000000000000000000000000..947d171c49579262833f8aef36fdbaee1494a7c4
--- /dev/null
+++ b/jdk/make/common/Subdirs.gmk
@@ -0,0 +1,204 @@
+# Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions
+#
+
+#
+# Generic makefile for building subdirectories.
+#
+# SUBDIRS variables to specify the subdirectories to build recursively.
+# Makefile has to include Subdirs.gmk AFTER all SUBDIRS variables are
+# defined.
+#
+# This file does not contain any rule.
+#
+# WARNING: This file is shared with other workspaces.
+#          So when it includes other files, it must use JDK_TOPDIR.
+
+#
+# SUBDIRS          subdirs for the base module always get built
+# SUBDIRS_<group>  subdirs for the named group
+#
+# By default, subdirs specified in the SUBDIRS and all SUBDIRS_* 
+# variables will be built.
+# 
+# BUILD_MODULES variable can be used to specify one or more groups
+# to be built (BUILD_MODULES=all will build all groups).
+#
+# Variables of the currently supported groups are:
+#  SUBDIRS_desktop    
+#  SUBDIRS_management
+#  SUBDIRS_enterprise
+#  SUBDIRS_misc
+#  SUBDIRS_tools
+# 
+# Change to the above list also need to update 
+# make/common/shared/Sanity.gmk.  NOTE: this list is subject
+# to change till the JDK 7 SE profiles/modules are finalized.
+# 
+# Eventually we want to restructure the make directory
+# according to these grouping (e.g. make/desktop/...) and
+# the SUBDIRS_<group> variables would not be needed.
+# 
+# To build the desktop and tools groups only, you can do:
+# gnumake BUILD_MODULES="desktop tools" ...
+# 
+
+# Iterate the subdirectories specified in $1.
+# - cd into each subdir and make them
+
+# Given a SUBDIRS* list (first argument), cd into them and make them
+#   SUBDIRS_MAKEFLAGS      Make settings for a subdir make
+#   SUBDIRS_MAKEFLAGS-$@   Make settings specific to this target
+#
+define subdirs-group-loop
+@$(ECHO) "Begin Processing SUBDIRS: $($1)"
+@for i in DUMMY $($1) ; do \
+  if [ "$$i" != "DUMMY" ] ; then \
+    $(MAKE) -C $$i $@ $(SUBDIRS_MAKEFLAGS) $(SUBDIRS_MAKEFLAGS-$@) \
+            FULL_VERSION=$(FULL_VERSION) RELEASE=$(RELEASE) || exit 1; \
+  fi ; \
+done
+@$(ECHO) "Done Processing SUBDIRS: $($1)"
+endef
+
+# Given a OTHERSUBDIRS list, cd into them and make them (extra loop define)
+#   OTHERSUBDIRS_MAKEFLAGS      Make settings for a subdir make
+define OTHERSUBDIRS-loop
+@$(ECHO) "Begin Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
+@for i in DUMMY $(OTHERSUBDIRS) ; do \
+  if [ "$$i" != "DUMMY" ] ; then \
+    $(MAKE) -C $$i $@ $(OTHERSUBDIRS_MAKEFLAGS) \
+            FULL_VERSION=$(FULL_VERSION) RELEASE=$(RELEASE) || exit 1; \
+  fi ; \
+done
+@$(ECHO) "Done Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
+endef
+
+#
+# Iterate the list specified in SUBDIRS_<group> only if
+# SUBDIRS_<group> is set and <group> or "all" is specified
+# in the BUILD_MODULES variable
+#
+ifdef SUBDIRS_desktop 
+  ifneq (,$(findstring desktop, $(BUILD_MODULES)))
+      define subdirs-desktop-loop
+         @$(call subdirs-group-loop,SUBDIRS_desktop)
+      endef
+  else
+    define subdirs-desktop-loop
+    endef
+  endif
+else   
+  define subdirs-desktop-loop
+  endef
+endif   # SUBDIRS_desktop 
+
+ifdef SUBDIRS_enterprise 
+  ifneq (,$(findstring enterprise, $(BUILD_MODULES)))
+      define subdirs-enterprise-loop
+         @$(call subdirs-group-loop,SUBDIRS_enterprise)
+      endef
+  else
+    define subdirs-enterprise-loop
+    endef
+  endif
+else   
+define subdirs-enterprise-loop
+endef
+endif   # SUBDIRS_enterprise 
+
+ifdef SUBDIRS_management 
+  ifneq (,$(findstring management, $(BUILD_MODULES)))
+      define subdirs-management-loop
+         @$(call subdirs-group-loop,SUBDIRS_management)
+      endef
+  else
+    define subdirs-management-loop
+    endef
+  endif
+else   
+define subdirs-management-loop
+endef
+endif   # SUBDIRS_management 
+
+ifdef SUBDIRS_misc 
+  ifneq (,$(findstring misc, $(BUILD_MODULES)))
+      define subdirs-misc-loop
+         @$(call subdirs-group-loop,SUBDIRS_misc)
+      endef
+  else
+    define subdirs-misc-loop
+    endef
+  endif
+else   
+define subdirs-misc-loop
+endef
+endif   # SUBDIRS_misc 
+
+ifdef SUBDIRS_tools 
+  ifneq (,$(findstring tools, $(BUILD_MODULES)))
+      define subdirs-tools-loop
+         @$(call subdirs-group-loop,SUBDIRS_tools)
+      endef
+  else
+    define subdirs-tools-loop
+    endef
+  endif
+else   
+define subdirs-tools-loop
+endef
+endif   # SUBDIRS_tools 
+
+#
+# If BUILD_MODULES is not set or it's set to "all",
+# iterate all groups.
+SUBDIRS_all = $(SUBDIRS) $(SUBDIRS_desktop) $(SUBDIRS_enterprise) \
+	      $(SUBDIRS_management) $(SUBDIRS_misc) $(SUBDIRS_tools)
+
+ifndef BUILD_MODULES
+define SUBDIRS-loop
+  @$(call subdirs-group-loop,SUBDIRS_all)
+endef
+
+else
+
+ifneq (,$(findstring all, $(BUILD_MODULES)))
+define SUBDIRS-loop
+  @$(call subdirs-group-loop,SUBDIRS_all)
+endef
+
+else # BUILD_MODULES set 
+#
+# Iterate SUBDIRS and the groups specified in BUILD_MODULES
+#
+define SUBDIRS-loop
+  @$(call subdirs-group-loop,SUBDIRS)
+  @$(subdirs-desktop-loop)
+  @$(subdirs-enterprise-loop)
+  @$(subdirs-management-loop)
+  @$(subdirs-misc-loop)
+  @$(subdirs-tools-loop)
+endef
+
+endif
+endif # BUILD_MODULES
diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk
index 7499f6bb189cb8944116b58d3c36398e848ef784..e7e3978bc8dabdaca4de1f257633b8c4b8b8aa06 100644
--- a/jdk/make/common/shared/Sanity.gmk
+++ b/jdk/make/common/shared/Sanity.gmk
@@ -218,7 +218,8 @@ include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk
 	sane-zip_version \
 	sane-unzip_version \
  	sane-msvcrt_path \
-        sane-freetype
+        sane-freetype \
+        sane-build_modules
 
 ######################################################
 # check for COPYRIGHT_YEAR variable
@@ -844,6 +845,21 @@ else
 sane-freetype: 
 endif
 
+######################################################
+# if specified, BUILD_MODULES must contain valid values.
+######################################################
+MODULES_REGEX="all|base|desktop|management|enterprise|misc|tools"
+sane-build_modules:
+ifdef BUILD_MODULES
+	@for m in $(BUILD_MODULES) ; do \
+            valid=`$(ECHO) $$m | $(EGREP) $(MODULES_REGEX)`; \
+            if [ "x$$valid" = "x" ] ; then \
+                $(ECHO) "ERROR: $$m set in the BUILD_MODULES variable is invalid.\n" \
+                "" >> $(ERROR_FILE); \
+            fi \
+	done
+endif
+
 ######################################################
 # CUPS_HEADERS_PATH must be valid
 ######################################################
diff --git a/jdk/make/java/Makefile b/jdk/make/java/Makefile
index ca48cc9bef562374bb6493fdb7b2f6e5eaba5ba6..e3d046f7ae49130b9e3071fce047ade3b1d6c41d 100644
--- a/jdk/make/java/Makefile
+++ b/jdk/make/java/Makefile
@@ -38,9 +38,13 @@ SUBDIRS += hpi version jvm redist verify fdlibm java sun_nio jli main zip
 
 # Others
 #    Note: java_crw_demo java_hprof_demo are demos but must be delivered built in sdk
-SUBDIRS += security npt java_crw_demo java_hprof_demo \
-	    math awt util text applet net nio dyn \
-	    sql rmi jar beans logging management instrument
+
+SUBDIRS += security math util text net nio jar
+
+SUBDIRS_desktop    = awt applet beans
+SUBDIRS_management = management
+SUBDIRS_misc       = npt java_crw_demo java_hprof_demo \
+                     logging instrument dyn sql rmi
 
 
 ifeq ($(PLATFORM), solaris)
@@ -53,6 +57,8 @@ ifeq ($(PLATFORM), linux)
   SUBDIRS += jexec
 endif # PLATFORM
 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/java/hpi/Makefile b/jdk/make/java/hpi/Makefile
index ee6453832ec0fe9abb0ef1fe93e324944b306f9a..69f3861c0b19faf441a926e0c0875fc203b17404 100644
--- a/jdk/make/java/hpi/Makefile
+++ b/jdk/make/java/hpi/Makefile
@@ -34,6 +34,8 @@ include $(BUILDDIR)/common/Defs.gmk
 # Build specified the HPI implementations
 #
 SUBDIRS = $(HPIS)
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/java/java/Makefile b/jdk/make/java/java/Makefile
index e3d5ee4231cc3ff99bdfe009d3c5015bf0afdc61..26853ac3aa8df121e4f9f78ddd3a219cc30397b1 100644
--- a/jdk/make/java/java/Makefile
+++ b/jdk/make/java/java/Makefile
@@ -218,6 +218,8 @@ ifeq ($(PLATFORM), solaris)
 endif
 
 SUBDIRS = reflect
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build:
 	$(SUBDIRS-loop)
 clean clobber::
diff --git a/jdk/make/java/java/genlocales.gmk b/jdk/make/java/java/genlocales.gmk
index 3adb769490d8ceda025d52b537e475e994a64bf5..df9aec7267834c92e455527cdef5edb46b03f4f0 100644
--- a/jdk/make/java/java/genlocales.gmk
+++ b/jdk/make/java/java/genlocales.gmk
@@ -49,7 +49,7 @@ Euro_Resources_properties := $(FILES_compiled_properties)
 # $(BUILDDIR)/java/text/FILES_java.gmk contains the "sun.text.resources" for 
 # European language support
 
-include $(BUILDDIR)/java/text/FILES_java.gmk
+include $(BUILDDIR)/java/text/base/FILES_java.gmk
 
 Euro_Resources_java += $(FILES_java)
 
diff --git a/jdk/make/java/main/Makefile b/jdk/make/java/main/Makefile
index 4e90729d4ea500ba23b10729d31c3acadbb62fa3..9758d6dd8a12b79633e403db3d4afe728ead77e2 100644
--- a/jdk/make/java/main/Makefile
+++ b/jdk/make/java/main/Makefile
@@ -36,6 +36,8 @@ SUBDIRS = java javaw
 else 
 SUBDIRS = java
 endif 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/java/nio/FILES_java.gmk b/jdk/make/java/nio/FILES_java.gmk
index e38e4c67d0be0eb2da26456fe93437c346d5c50b..f1f58dc972048efe58ff20c506805a876e519d53 100644
--- a/jdk/make/java/nio/FILES_java.gmk
+++ b/jdk/make/java/nio/FILES_java.gmk
@@ -26,7 +26,6 @@
 FILES_src = \
 	java/nio/Bits.java \
 	java/nio/Buffer.java \
-	java/nio/BufferPoolMXBean.java \
 	java/nio/ByteOrder.java \
 	java/nio/MappedByteBuffer.java \
 	java/nio/StringCharBuffer.java \
diff --git a/jdk/make/java/nio/Makefile b/jdk/make/java/nio/Makefile
index 6dd15eac239ba8469c1c7a9e8cd9ac1853383f2c..b2a17e2699130984d4a32e1a02e50acfc03facb9 100644
--- a/jdk/make/java/nio/Makefile
+++ b/jdk/make/java/nio/Makefile
@@ -304,7 +304,11 @@ endif # PLATFORM
 # Rules
 #
 
+SUBDIRS_management = mxbean
+include $(BUILDDIR)/common/Subdirs.gmk
+
 build: sources
+	$(SUBDIRS-loop)
 
 clean clobber::
 	$(RM) -r $(NIO_GEN) $(SNIO_GEN)
diff --git a/jdk/make/java/nio/mxbean/Makefile b/jdk/make/java/nio/mxbean/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..383d4dc18c51ec4ebdeb2ebb585ff6846ae4ff67
--- /dev/null
+++ b/jdk/make/java/nio/mxbean/Makefile
@@ -0,0 +1,34 @@
+#
+# Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+BUILDDIR = ../../..
+MODULE   = management
+PACKAGE  = java.nio
+PRODUCT  = java
+include $(BUILDDIR)/common/Defs.gmk
+
+FILES_java = java/nio/BufferPoolMXBean.java
+
+include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/java/redist/Makefile b/jdk/make/java/redist/Makefile
index d66244920f32327da3df22d19faab7b538a079cb..28821008ab623096f5c1354068a61f25792f2b0f 100644
--- a/jdk/make/java/redist/Makefile
+++ b/jdk/make/java/redist/Makefile
@@ -62,7 +62,10 @@ CLASSSHARINGDATA_DIR   = $(BUILDDIR)/tools/sharing
 # Needed to do file copy
 ABS_BUILDDIR :=$(call FullPath,$(BUILDDIR))
 
-SUBDIRS = fonts sajdi
+SUBDIRS_desktop = fonts
+SUBDIRS_tools   = sajdi
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/java/text/Makefile b/jdk/make/java/text/Makefile
index 001f4717a9ec8def93de4f6d57351d2b5fdab869..4bda138f67634eaf863d8ebcc8e8604c7ee4e9f4 100644
--- a/jdk/make/java/text/Makefile
+++ b/jdk/make/java/text/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,86 +23,19 @@
 # have any questions.
 #
 
-BUILDDIR = ../..
-MODULE  = base
-PACKAGE = java.text
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-include FILES_java.gmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-#
-# Rules to add data files BreakIterator
 #
-TEXT_CLASSES = $(BUILDTOOLCLASSDIR)/java.text/classes
-
-# input
-#
-#   Notes: sun.text.resources.BreakIteratorRules no longer goes to runtime.
-#     They are used at JDK build phase in order to create $(BIFILES) which
-#     are used on runtime instead.
+# Makefile for building all of java.text
 #
-TEXT_SRCDIR  = $(SHARE_SRC)/classes/sun/text/resources
-TEXT_SOURCES = $(TEXT_SRCDIR)/BreakIteratorRules.java \
-               $(TEXT_SRCDIR)/BreakIteratorInfo.java
-UNICODEDATA  = $(BUILDDIR)/tools/UnicodeData
-
-# output
-TEXT_CLASSDIR  = $(CLASSBINDIR)/sun/text/resources
-BIFILES = $(TEXT_CLASSDIR)/CharacterBreakIteratorData \
-          $(TEXT_CLASSDIR)/WordBreakIteratorData \
-          $(TEXT_CLASSDIR)/LineBreakIteratorData \
-          $(TEXT_CLASSDIR)/SentenceBreakIteratorData
-
-ICU_FILES = $(TEXT_CLASSDIR)/unorm.icu \
-            $(TEXT_CLASSDIR)/uprops.icu \
-            $(TEXT_CLASSDIR)/ubidi.icu
-
-# builder
-GENERATEBREAKITERATORDATA_JARFILE = \
-    $(BUILDTOOLJARDIR)/generatebreakiteratordata.jar
-
-$(BIFILES): $(GENERATEBREAKITERATORDATA_JARFILE) \
-    $(UNICODEDATA)/UnicodeData.txt \
-    $(TEXT_SOURCES)
-	$(prep-target)
-	$(RM) -r $(TEXT_CLASSES)
-	$(MKDIR) -p $(TEXT_CLASSES)
-	$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-		-sourcepath $(TEXT_SRCDIR) \
-		$(TEXT_SOURCES)
-	$(MKDIR) -p  $(TEXT_CLASSDIR)
-	$(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
-		-jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-		-o $(TEXT_CLASSDIR) \
-		-spec $(UNICODEDATA)/UnicodeData.txt
-	@$(java-vm-cleanup)
 
-build: $(BIFILES) $(ICU_FILES)
-
-#
-# Extra rules to copy unorm.icu, uprops.icu, and ubidi.icu
-#
-$(TEXT_CLASSDIR)/unorm.icu: $(TEXT_SRCDIR)/unorm.icu
-	$(install-file)
+BUILDDIR = ../..
+PRODUCT = sun
+include $(BUILDDIR)/common/Defs.gmk
 
-$(TEXT_CLASSDIR)/uprops.icu: $(TEXT_SRCDIR)/uprops.icu
-	$(install-file)
+SUBDIRS         = base
+SUBDIRS_desktop = bidi
 
-$(TEXT_CLASSDIR)/ubidi.icu: $(TEXT_SRCDIR)/ubidi.icu
-	$(install-file)
+include $(BUILDDIR)/common/Subdirs.gmk
 
-clean clobber::
-	$(RM) -r $(TEXT_CLASSES)
-	$(RM) -r $(BIFILES)
-	$(RM) $(ICU_FILES)
+all build clean clobber::
+	$(SUBDIRS-loop)
 
diff --git a/jdk/make/java/text/FILES_java.gmk b/jdk/make/java/text/base/FILES_java.gmk
similarity index 98%
rename from jdk/make/java/text/FILES_java.gmk
rename to jdk/make/java/text/base/FILES_java.gmk
index ada9bde7feefa684ba9d5eb9dac1c9d10396f3a4..6ca1f72c5b807326706df8a5610d4d3196c30210 100644
--- a/jdk/make/java/text/FILES_java.gmk
+++ b/jdk/make/java/text/base/FILES_java.gmk
@@ -29,7 +29,6 @@ FILES_java = \
     java/text/AttributedString.java \
     java/text/BreakDictionary.java \
     java/text/BreakIterator.java \
-    java/text/Bidi.java \
     java/text/CharacterIterator.java \
     java/text/CharacterIteratorFieldDelegate.java \
     java/text/ChoiceFormat.java \
@@ -76,10 +75,6 @@ FILES_java = \
         sun/text/Normalizer.java \
         sun/text/SupplementaryCharacterData.java \
         sun/text/UCompactIntArray.java \
-            sun/text/bidi/BidiBase.java \
-            sun/text/bidi/BidiLine.java \
-            sun/text/bidi/BidiRun.java \
-            \
             sun/text/normalizer/CharTrie.java \
             sun/text/normalizer/CharacterIteratorWrapper.java \
             sun/text/normalizer/ICUBinary.java \
diff --git a/jdk/make/java/text/base/Makefile b/jdk/make/java/text/base/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..d4cc5164a1f40045839f1841aa01c7df05ae10e3
--- /dev/null
+++ b/jdk/make/java/text/base/Makefile
@@ -0,0 +1,108 @@
+#
+# Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+BUILDDIR = ../../..
+MODULE  = base
+PACKAGE = java.text
+PRODUCT = sun
+
+include $(BUILDDIR)/common/Defs.gmk
+
+#
+# Files
+#
+include FILES_java.gmk
+
+#
+# Include
+#
+include $(BUILDDIR)/common/Classes.gmk
+
+#
+# Rules to add data files BreakIterator
+#
+TEXT_CLASSES = $(BUILDTOOLCLASSDIR)/java.text/classes
+
+# input
+#
+#   Notes: sun.text.resources.BreakIteratorRules no longer goes to runtime.
+#     They are used at JDK build phase in order to create $(BIFILES) which
+#     are used on runtime instead.
+#
+TEXT_SRCDIR  = $(SHARE_SRC)/classes/sun/text/resources
+TEXT_SOURCES = $(TEXT_SRCDIR)/BreakIteratorRules.java \
+               $(TEXT_SRCDIR)/BreakIteratorInfo.java
+UNICODEDATA  = $(BUILDDIR)/tools/UnicodeData
+
+# output
+TEXT_CLASSDIR  = $(CLASSBINDIR)/sun/text/resources
+BIFILES = $(TEXT_CLASSDIR)/CharacterBreakIteratorData \
+          $(TEXT_CLASSDIR)/WordBreakIteratorData \
+          $(TEXT_CLASSDIR)/LineBreakIteratorData \
+          $(TEXT_CLASSDIR)/SentenceBreakIteratorData
+
+ICU_FILES = $(TEXT_CLASSDIR)/unorm.icu \
+            $(TEXT_CLASSDIR)/uprops.icu \
+            $(TEXT_CLASSDIR)/ubidi.icu
+
+# builder
+GENERATEBREAKITERATORDATA_JARFILE = \
+    $(BUILDTOOLJARDIR)/generatebreakiteratordata.jar
+
+$(BIFILES): $(GENERATEBREAKITERATORDATA_JARFILE) \
+    $(UNICODEDATA)/UnicodeData.txt \
+    $(TEXT_SOURCES)
+	$(prep-target)
+	$(RM) -r $(TEXT_CLASSES)
+	$(MKDIR) -p $(TEXT_CLASSES)
+	$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
+		-sourcepath $(TEXT_SRCDIR) \
+		$(TEXT_SOURCES)
+	$(MKDIR) -p  $(TEXT_CLASSDIR)
+	$(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
+		-jar $(GENERATEBREAKITERATORDATA_JARFILE) \
+		-o $(TEXT_CLASSDIR) \
+		-spec $(UNICODEDATA)/UnicodeData.txt
+	@$(java-vm-cleanup)
+
+build: $(BIFILES) $(ICU_FILES)
+
+#
+# Extra rules to copy unorm.icu, uprops.icu, and ubidi.icu
+#
+$(TEXT_CLASSDIR)/unorm.icu: $(TEXT_SRCDIR)/unorm.icu
+	$(install-file)
+
+$(TEXT_CLASSDIR)/uprops.icu: $(TEXT_SRCDIR)/uprops.icu
+	$(install-file)
+
+$(TEXT_CLASSDIR)/ubidi.icu: $(TEXT_SRCDIR)/ubidi.icu
+	$(install-file)
+
+clean clobber::
+	$(RM) -r $(TEXT_CLASSES)
+	$(RM) -r $(BIFILES)
+	$(RM) $(ICU_FILES)
+
diff --git a/jdk/make/java/text/bidi/Makefile b/jdk/make/java/text/bidi/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..e61c53353403be6e2cf24f0d57e217bc7c4afafe
--- /dev/null
+++ b/jdk/make/java/text/bidi/Makefile
@@ -0,0 +1,44 @@
+#
+# Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+BUILDDIR = ../../..
+PACKAGE = java.text
+PRODUCT = sun
+include $(BUILDDIR)/common/Defs.gmk
+
+#
+# Files for Bidi that is not in the base module
+#
+FILES_java = \
+    java/text/Bidi.java \
+    sun/text/bidi/BidiBase.java \
+    sun/text/bidi/BidiLine.java \
+    sun/text/bidi/BidiRun.java \
+    sun/text/CodePointIterator.java
+
+#
+# Include
+#
+include $(BUILDDIR)/common/Classes.gmk
diff --git a/jdk/make/javax/Makefile b/jdk/make/javax/Makefile
index 8ec72ade7e18e5e5560debb59aef9fcd5a5e9fca..15f5cd7ecb29c7c7894b58a8afb6ae7e48df4179 100644
--- a/jdk/make/javax/Makefile
+++ b/jdk/make/javax/Makefile
@@ -30,19 +30,24 @@
 BUILDDIR = ..
 include $(BUILDDIR)/common/Defs.gmk
 
+SUBDIRS = others
+
+SUBDIRS_management = management
+
+SUBDIRS_misc = \
+        crypto \
+        sql \
+        rmi
+
 # imageio uses xml, so build it last
+SUBDIRS_desktop = \
+        accessibility \
+        print \
+        swing \
+        sound \
+        imageio
 
-SUBDIRS = \
-	others \
-	accessibility \
-	print \
-	swing \
-	crypto \
-	sound \
-	sql \
-	rmi \
-	management \
-	imageio
+include $(BUILDDIR)/common/Subdirs.gmk
 
 all build:
 	$(SUBDIRS-loop)
diff --git a/jdk/make/javax/rmi/Makefile b/jdk/make/javax/rmi/Makefile
index 10910f5d213ffd358f64c6a383e4c45b54c35caa..49f6c817900384f544d6569d50516e92993b3c37 100644
--- a/jdk/make/javax/rmi/Makefile
+++ b/jdk/make/javax/rmi/Makefile
@@ -31,6 +31,8 @@ BUILDDIR = ../..
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = ssl
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/javax/sound/Makefile b/jdk/make/javax/sound/Makefile
index 8b4948a15e1fe58d6df8037d0d6f76a2ce9d806a..cc6c274e785e9a4ea35caaa0a7601c706ae30e9b 100644
--- a/jdk/make/javax/sound/Makefile
+++ b/jdk/make/javax/sound/Makefile
@@ -159,6 +159,7 @@ vpath %.cpp $(PLATFORM_SRC)/native/com/sun/media/sound
 # Include rules
 #
 include $(BUILDDIR)/common/Library.gmk
+include $(BUILDDIR)/common/Subdirs.gmk
 
 #
 # Rules that copy files.
diff --git a/jdk/make/javax/swing/Makefile b/jdk/make/javax/swing/Makefile
index 16bfcac03ab8fb9bf730cc9c92324fefa41a390e..7331426a0750bb4bddc80b0703246754a95cefbb 100644
--- a/jdk/make/javax/swing/Makefile
+++ b/jdk/make/javax/swing/Makefile
@@ -40,6 +40,7 @@ AUTO_JAVA_PRUNE = plaf
 SUBDIRS = html32dtd plaf
 
 include $(BUILDDIR)/common/Classes.gmk
+include $(BUILDDIR)/common/Subdirs.gmk
 
 build: other_files
 	$(SUBDIRS-loop)
diff --git a/jdk/make/jpda/Makefile b/jdk/make/jpda/Makefile
index b2567882efab1c46d5fed75601f0001fc864aa39..857952b24bc6b379b858ee668ffb8ef7ee6e77a1 100644
--- a/jdk/make/jpda/Makefile
+++ b/jdk/make/jpda/Makefile
@@ -35,6 +35,7 @@ include $(BUILDDIR)/common/Defs.gmk
 # Core.
 #
 SUBDIRS    = jdwp back front transport expr tty bdi gui
+include $(BUILDDIR)/common/Subdirs.gmk
 
 all build clean clobber::
 	$(SUBDIRS-loop)
diff --git a/jdk/make/jpda/transport/Makefile b/jdk/make/jpda/transport/Makefile
index 9069032fa6ecc57c859f752aed7f308d18f21834..dddc0dbc84ff33183a05c5fe05a1b65534d88658 100644
--- a/jdk/make/jpda/transport/Makefile
+++ b/jdk/make/jpda/transport/Makefile
@@ -36,6 +36,8 @@ SUBDIRS = socket
 ifeq ($(PLATFORM), windows)
 SUBDIRS += shmem
 endif # PLATFORM
+
+include $(BUILDDIR)/common/Subdirs.gmk
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/mkdemo/Makefile b/jdk/make/mkdemo/Makefile
index b0bd7f5902d63951a7c16848fc5f1306859e9036..86e9de6a0307b55d7bf1b89e317ecd4181ccd90f 100644
--- a/jdk/make/mkdemo/Makefile
+++ b/jdk/make/mkdemo/Makefile
@@ -31,7 +31,13 @@ BUILDDIR = ..
 PRODUCT = demos
 include $(BUILDDIR)/common/Defs.gmk
 
-SUBDIRS = applets jfc jvmti management jni scripting jpda
+SUBDIRS            = jni
+SUBDIRS_desktop    = applets jfc
+SUBDIRS_management = management
+SUBDIRS_misc       = scripting
+SUBDIRS_tools      = jpda jvmti
+
+include $(BUILDDIR)/common/Subdirs.gmk
 
 all build:: nbproject
 	$(SUBDIRS-loop)
diff --git a/jdk/make/mkdemo/applets/Makefile b/jdk/make/mkdemo/applets/Makefile
index f8000bfdc7cf1f3c780bd7d31267f33fdee3adbb..79e0a9d2bb968fd746d83bcd3507e085a97ed10c 100644
--- a/jdk/make/mkdemo/applets/Makefile
+++ b/jdk/make/mkdemo/applets/Makefile
@@ -40,6 +40,7 @@ endif
 
 SUBDIRS_MAKEFLAGS += DEMO_IS_APPLET=true
 
+include $(BUILDDIR)/common/Subdirs.gmk
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/mkdemo/jfc/Makefile b/jdk/make/mkdemo/jfc/Makefile
index 06817a1cb23f34903e3c61d0efad501174a3f6ac..e57ca5b9c1f4be6fb031130bfd8c8c687cefe5e7 100644
--- a/jdk/make/mkdemo/jfc/Makefile
+++ b/jdk/make/mkdemo/jfc/Makefile
@@ -46,6 +46,7 @@ ifndef OPENJDK
   SUBDIRS += Java2D SwingSet2 Stylepad
 endif
 
+include $(BUILDDIR)/common/Subdirs.gmk
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/mkdemo/jni/Makefile b/jdk/make/mkdemo/jni/Makefile
index 4cc363902e5715860b4685b55d67766bbcf9351f..dd9e617c3c2b967afe7ec87bb1f3c2ee96ec85b3 100644
--- a/jdk/make/mkdemo/jni/Makefile
+++ b/jdk/make/mkdemo/jni/Makefile
@@ -37,6 +37,8 @@ ifeq ($(PLATFORM),solaris)
   SUBDIRS += Poller
 endif
 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/mkdemo/jvmti/Makefile b/jdk/make/mkdemo/jvmti/Makefile
index c966170fceb085ebbbb51c5103f7aabe302642ac..f59a9d287c8a9f5acccdac6044f879e5548e5f3a 100644
--- a/jdk/make/mkdemo/jvmti/Makefile
+++ b/jdk/make/mkdemo/jvmti/Makefile
@@ -48,6 +48,8 @@ SUBDIRS = \
 	  waiters \
 	  hprof
 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/mkdemo/management/Makefile b/jdk/make/mkdemo/management/Makefile
index e80b30afe0c04d7275998dd6c9ccccae1b9eb17b..42d3c7c6775d7062d0c4dca94b163ec1c0334d80 100644
--- a/jdk/make/mkdemo/management/Makefile
+++ b/jdk/make/mkdemo/management/Makefile
@@ -38,6 +38,8 @@ SUBDIRS = FullThreadDump \
 	  MemoryMonitor  \
 	  JTop
 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/mkdemo/scripting/Makefile b/jdk/make/mkdemo/scripting/Makefile
index b32cfb77d5a9f3618a7e62f231f86a34a218ddbb..42e46ed3b04ed2ca30f39079559bc6de734de44b 100644
--- a/jdk/make/mkdemo/scripting/Makefile
+++ b/jdk/make/mkdemo/scripting/Makefile
@@ -32,6 +32,7 @@ PRODUCT = demos
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = jconsole-plugin
+include $(BUILDDIR)/common/Subdirs.gmk
 
 all build clean clobber::
 	$(SUBDIRS-loop)
diff --git a/jdk/make/mksample/Makefile b/jdk/make/mksample/Makefile
index 2d87ebd734c01b004131369f5cfcd5cf76f69cf7..0822f031de8b78a0931c41baa623d6355be9feef 100644
--- a/jdk/make/mksample/Makefile
+++ b/jdk/make/mksample/Makefile
@@ -37,13 +37,18 @@ else
   WEBSERVICES_SUBDIR = webservices
 endif
 
-SUBDIRS = nio jmx scripting $(WEBSERVICES_SUBDIR) nbproject
+SUBDIRS =
+SUBDIRS_misc = nio scripting nbproject
+SUBDIRS_enterprise = $(WEBSERVICES_SUBDIR)
+SUBDIRS_management = jmx
 
 # include dtrace samples in Solaris builds
 ifeq ($(PLATFORM), solaris) 
 	SUBDIRS += dtrace
 endif
 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/mksample/jmx/Makefile b/jdk/make/mksample/jmx/Makefile
index 94d0a1843df96d911b0b6950653d04b3ab08eb95..0528442dce0d62ddbfa75d84a9993f1f618d62ff 100644
--- a/jdk/make/mksample/jmx/Makefile
+++ b/jdk/make/mksample/jmx/Makefile
@@ -32,6 +32,8 @@ PRODUCT = java
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = jmx-scandir
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/mksample/nio/Makefile b/jdk/make/mksample/nio/Makefile
index 5fcfd03a78306c2ad9dad77f6595f6959dfd943d..03fc36d3ac2c5c906c5e3215b616c8675f275cf7 100644
--- a/jdk/make/mksample/nio/Makefile
+++ b/jdk/make/mksample/nio/Makefile
@@ -32,6 +32,8 @@ PRODUCT = java
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = file multicast server
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/mksample/scripting/Makefile b/jdk/make/mksample/scripting/Makefile
index 0fd9e8737e56102fb76cb6e2a69e0198e3f18fcb..2cae9f6c40e9aa4571a1dad224bbbda8e8b32904 100644
--- a/jdk/make/mksample/scripting/Makefile
+++ b/jdk/make/mksample/scripting/Makefile
@@ -32,6 +32,8 @@ PRODUCT = java
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = scriptpad
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/mksample/webservices/Makefile b/jdk/make/mksample/webservices/Makefile
index 208db3c6448c39c7725cf3e3d24e637a1ccd6f0e..4dee839c34b9470905aad4d2d72f3db606899613 100644
--- a/jdk/make/mksample/webservices/Makefile
+++ b/jdk/make/mksample/webservices/Makefile
@@ -32,6 +32,7 @@ PRODUCT = java
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = EbayClient EbayServer
+include $(BUILDDIR)/common/Subdirs.gmk
 
 all build clean clobber::
 	$(SUBDIRS-loop)
diff --git a/jdk/make/org/Makefile b/jdk/make/org/Makefile
index 0b66445eccdbcf3866d0256072b2869685344bd8..1d249295be77eedc90929b0900c455defa95e169 100644
--- a/jdk/make/org/Makefile
+++ b/jdk/make/org/Makefile
@@ -32,6 +32,7 @@ PRODUCT = org
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = ietf jcp
+include $(BUILDDIR)/common/Subdirs.gmk
 
 all build clean clobber::
 	$(SUBDIRS-loop)
diff --git a/jdk/make/org/ietf/Makefile b/jdk/make/org/ietf/Makefile
index 9c4618701ca23818b8d143d0f8d31f89184288ec..0d3835b245974e19147a2d63228919fceb172a12 100644
--- a/jdk/make/org/ietf/Makefile
+++ b/jdk/make/org/ietf/Makefile
@@ -31,6 +31,8 @@ BUILDDIR = ../..
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = jgss
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/sun/Makefile b/jdk/make/sun/Makefile
index 7cf480fa83d3eb2c8b788d54ba5808409f5bab35..8e224e52aeb6f349f36d0493c8d79d426509ac60 100644
--- a/jdk/make/sun/Makefile
+++ b/jdk/make/sun/Makefile
@@ -58,13 +58,18 @@ ifdef OPENJDK
 else
   RENDER_SUBDIR = dcpr
 endif
+
 # nio need to be compiled before awt to have all charsets ready
-SUBDIRS = jar security javazic misc jkernel net audio $(RENDER_SUBDIR) image \
-	  nio awt splashscreen $(XAWT_SUBDIR) \
-          $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
-	  font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
-	  jawt text launcher management $(ORG_SUBDIR) \
-          native2ascii serialver tools jconsole tracing
+SUBDIRS            = jar security javazic misc net nio text launcher
+SUBDIRS_desktop    = audio $(RENDER_SUBDIR) image \
+                     awt splashscreen $(XAWT_SUBDIR) \
+                     $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
+                     jawt font jpeg cmm applet beans
+SUBDIRS_management = management
+SUBDIRS_misc       = jkernel $(ORG_SUBDIR) \
+                     rmi $(JDBC_SUBDIR) tracing
+SUBDIRS_tools      = native2ascii serialver tools jconsole
+include $(BUILDDIR)/common/Subdirs.gmk
 
 all build clean clobber::
 	$(SUBDIRS-loop)
diff --git a/jdk/make/sun/cmm/Makefile b/jdk/make/sun/cmm/Makefile
index dc8a87b6e69d82eecad234fbf38efc470e79faa0..e6738821c59d9dca156cb78b579b277aafa96353 100644
--- a/jdk/make/sun/cmm/Makefile
+++ b/jdk/make/sun/cmm/Makefile
@@ -36,6 +36,8 @@ else # !OPENJDK
     ICCPROFILE_SRC_DIR = $(CLOSED_SRC)/share/lib/cmm/kcms
 endif # OPENJDK
 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 #
 # ICC Profiles used by the CMM.
 #
diff --git a/jdk/make/sun/image/Makefile b/jdk/make/sun/image/Makefile
index 0a264b669d1f97e48d78cf31ae78a7589e434dae..cd69637b9ef2b4d806456914668e2d44444c6445 100644
--- a/jdk/make/sun/image/Makefile
+++ b/jdk/make/sun/image/Makefile
@@ -43,6 +43,8 @@ ifeq ($(PLATFORM),solaris)
   endif
 endif
 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/sun/management/Makefile b/jdk/make/sun/management/Makefile
index a54b1dd0be9fcd7140bd4722659d4a25c40e3c1f..516cd0dc59981bf9a7ea6fbc7ac7d6da6000c084 100644
--- a/jdk/make/sun/management/Makefile
+++ b/jdk/make/sun/management/Makefile
@@ -47,6 +47,8 @@ else
 endif
 SUBDIRS += jmxremote
  
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/sun/net/Makefile b/jdk/make/sun/net/Makefile
index d5d3dd16a2baf6dcfb039cea60a6f9c6b5b05577..7ddc94f04b2c80aa3a1b2d5a657928b4555b4575 100644
--- a/jdk/make/sun/net/Makefile
+++ b/jdk/make/sun/net/Makefile
@@ -29,6 +29,8 @@ PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = others spi
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/sun/net/spi/Makefile b/jdk/make/sun/net/spi/Makefile
index 7fa860032e696bcbf4cd1ade071193111d87a786..7ecefa88ff271e59dbac18c5a036a3ed9a0f2cca 100644
--- a/jdk/make/sun/net/spi/Makefile
+++ b/jdk/make/sun/net/spi/Makefile
@@ -26,7 +26,9 @@
 BUILDDIR = ../../..
 include $(BUILDDIR)/common/Defs.gmk
 
-SUBDIRS = nameservice 
+SUBDIRS_misc = nameservice 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/sun/net/spi/nameservice/Makefile b/jdk/make/sun/net/spi/nameservice/Makefile
index 4c9aba37a8fcde7d98659cbf49a2ba704420b73d..f7df0b79ae7a68a7c402e4e7889780099bc2db57 100644
--- a/jdk/make/sun/net/spi/nameservice/Makefile
+++ b/jdk/make/sun/net/spi/nameservice/Makefile
@@ -27,6 +27,8 @@ BUILDDIR = ../../../..
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = dns 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/sun/nio/Makefile b/jdk/make/sun/nio/Makefile
index 76051c1b17acd9883aeec341ba86fac7eb5c1b61..538c0bc37bb21b2652845b5bdb8547ac2965e186 100644
--- a/jdk/make/sun/nio/Makefile
+++ b/jdk/make/sun/nio/Makefile
@@ -29,6 +29,8 @@ PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = cs
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/sun/org/Makefile b/jdk/make/sun/org/Makefile
index 7d3496aa95bc58874723076b075c26fc6702f373..ddfb2c5fcf54c50ae366e6986277e41ed61e9b7f 100644
--- a/jdk/make/sun/org/Makefile
+++ b/jdk/make/sun/org/Makefile
@@ -32,6 +32,8 @@ PRODUCT = org
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS =  mozilla
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/sun/org/mozilla/Makefile b/jdk/make/sun/org/mozilla/Makefile
index 47f467f16acf29ef96d5877a09b04197f42b755b..2eadf61de0c5d276caa47582467070f65ae6525e 100644
--- a/jdk/make/sun/org/mozilla/Makefile
+++ b/jdk/make/sun/org/mozilla/Makefile
@@ -32,6 +32,8 @@ PRODUCT = org
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = javascript
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)
 
diff --git a/jdk/make/sun/rmi/Makefile b/jdk/make/sun/rmi/Makefile
index 59179b0c0f0e8df86f17de60a077c87236be7eff..3acbd21de3930e120286dfc5d1289e628f35367c 100644
--- a/jdk/make/sun/rmi/Makefile
+++ b/jdk/make/sun/rmi/Makefile
@@ -43,6 +43,8 @@ ifeq ($(PLATFORM), windows)
     SUBDIRS += cgi
 endif # PLATFORM
 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 # Then do the rest
 all build clean clobber ::
 	$(SUBDIRS-loop)
diff --git a/jdk/make/sun/security/Makefile b/jdk/make/sun/security/Makefile
index 92371cc60cbf5681f4434dbcb355ac8cafcc7117..1950c892623550d1dd6eda1631c77f51da42d1e5 100644
--- a/jdk/make/sun/security/Makefile
+++ b/jdk/make/sun/security/Makefile
@@ -67,8 +67,10 @@ ifdef DISABLE_INTREE_EC
   INTREE_EC =
 endif
 
-SUBDIRS = $(INTREE_EC) other action util tools jgss krb5 smartcardio \
-	  $(PKCS11) $(JGSS_WRAPPER) $(MSCAPI)
+SUBDIRS       = $(INTREE_EC) other action util krb5
+SUBDIRS_misc  = jgss $(PKCS11) $(JGSS_WRAPPER) $(MSCAPI) smartcardio
+SUBDIRS_tools = tools
+include $(BUILDDIR)/common/Subdirs.gmk
 
 all build clean clobber::
 	$(SUBDIRS-loop)
diff --git a/jdk/make/sun/tracing/Makefile b/jdk/make/sun/tracing/Makefile
index 5c3711f0054f55a260e63ef53278b72704aae541..f9f4439cdeb6c8db2ad1a286afef6fbd5a3938e9 100644
--- a/jdk/make/sun/tracing/Makefile
+++ b/jdk/make/sun/tracing/Makefile
@@ -33,6 +33,8 @@ PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
 SUBDIRS = dtrace
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build:
 	$(SUBDIRS-loop)
 clean clobber::
diff --git a/jdk/make/tools/Makefile b/jdk/make/tools/Makefile
index d92550cdd951c28125dcca782ea365b1feacd094..24c0fb19cb6ae91944ad30a3b9bf9853ba3f87fb 100644
--- a/jdk/make/tools/Makefile
+++ b/jdk/make/tools/Makefile
@@ -56,6 +56,8 @@ ifndef DISABLE_NIMBUS
   SUBDIRS += generate_nimbus
 endif
 
+include $(BUILDDIR)/common/Subdirs.gmk
+
 all build clean clobber::
 	$(SUBDIRS-loop)