diff -r de44744708a2 -r c98da2209f8c jdk/make/Makefile
--- a/jdk/make/Makefile	Wed Feb 10 13:23:50 2010 +0000
+++ b/jdk/make/Makefile	Wed Feb 10 17:51:07 2010 -0800
@@ -240,7 +240,12 @@
 
 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)