changeset 14493:2376cb553336

Jake part of JDK-8143141, makefile cleanup between jake and jdk9
author erikj
date Tue, 17 Nov 2015 16:38:11 +0100
parents c40287b843b3
children 5aadb299a052
files make/copy/Copy-java.base.gmk make/copy/CopyCommon.gmk make/gensrc/Gensrc-java.management.gmk make/launcher/Launcher-java.base.gmk make/launcher/Launcher-java.corba.gmk make/launcher/Launcher-java.desktop.gmk make/launcher/Launcher-java.rmi.gmk make/launcher/Launcher-java.scripting.gmk make/launcher/Launcher-java.security.jgss.gmk make/launcher/Launcher-jdk.compiler.gmk make/launcher/Launcher-jdk.hotspot.agent.gmk make/launcher/Launcher-jdk.jartool.gmk make/launcher/Launcher-jdk.javadoc.gmk make/launcher/Launcher-jdk.jcmd.gmk make/launcher/Launcher-jdk.jconsole.gmk make/launcher/Launcher-jdk.jdeps.gmk make/launcher/Launcher-jdk.jdi.gmk make/launcher/Launcher-jdk.jlink.gmk make/launcher/Launcher-jdk.jshell.gmk make/launcher/Launcher-jdk.jvmstat.gmk make/launcher/Launcher-jdk.pack200.gmk make/launcher/Launcher-jdk.policytool.gmk make/launcher/Launcher-jdk.rmic.gmk make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk make/launcher/Launcher-jdk.xml.bind.gmk make/launcher/Launcher-jdk.xml.ws.gmk make/launcher/LauncherCommon.gmk make/lib/CoreLibraries.gmk make/lib/Lib-java.instrument.gmk make/lib/Lib-jdk.crypto.ucrypto.gmk make/lib/Lib-jdk.internal.le.gmk make/lib/SecurityLibraries.gmk
diffstat 32 files changed, 58 insertions(+), 104 deletions(-) [+]
line wrap: on
line diff
--- a/make/copy/Copy-java.base.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/copy/Copy-java.base.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -215,4 +215,4 @@
   TARGETS += $(CONF_DST_DIR)/sdp/sdp.conf.template
 endif
 
-##########################################################################################
+################################################################################
--- a/make/copy/CopyCommon.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/copy/CopyCommon.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -23,7 +23,7 @@
 # questions.
 #
 
-INCLUDE_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE)
+INCLUDE_DST_DIR := $(MODULES_INCLUDE_OUTPUTDIR)/$(MODULE)
 LIB_DST_DIR := $(MODULES_LIBS_OUTPUTDIR)/$(MODULE)
 CONF_DST_DIR := $(MODULES_CONF_OUTPUTDIR)/$(MODULE)
 
--- a/make/gensrc/Gensrc-java.management.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/gensrc/Gensrc-java.management.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -28,8 +28,6 @@
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, jdk, gensrc/Gensrc-java.management.gmk))
 
-TARGETS += $(GENSRC_JAVA_MANAGEMENT)
-
 ################################################################################
 
 include GensrcProperties.gmk
--- a/make/launcher/Launcher-java.base.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-java.base.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -68,8 +68,7 @@
 endif
 
 $(eval $(call SetupBuildLauncher, keytool, \
-    MAIN_MODULE := java.base, \
-    MAIN_CLASS  := sun.security.tools.keytool.Main, \
+    MAIN_CLASS := sun.security.tools.keytool.Main, \
 ))
 
 ################################################################################
--- a/make/launcher/Launcher-java.corba.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-java.corba.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,13 +26,11 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, idlj, \
-    MAIN_MODULE := java.corba, \
-    MAIN_CLASS  := com.sun.tools.corba.se.idl.toJavaPortable.Compile, \
+    MAIN_CLASS := com.sun.tools.corba.se.idl.toJavaPortable.Compile, \
 ))
 
 $(eval $(call SetupBuildLauncher, orbd, \
-    MAIN_MODULE := java.corba, \
-    MAIN_CLASS  := com.sun.corba.se.impl.activation.ORBD, \
+    MAIN_CLASS := com.sun.corba.se.impl.activation.ORBD, \
     JAVA_ARGS := \
         -Dcom.sun.CORBA.activation.DbDir=./orb.db \
         -Dcom.sun.CORBA.activation.Port=1049 \
@@ -40,13 +38,11 @@
 ))
 
 $(eval $(call SetupBuildLauncher, servertool, \
-    MAIN_MODULE := java.corba, \
-    MAIN_CLASS  := com.sun.corba.se.impl.activation.ServerTool, \
+    MAIN_CLASS := com.sun.corba.se.impl.activation.ServerTool, \
 ))
 
 $(eval $(call SetupBuildLauncher, tnameserv, \
-    MAIN_MODULE := java.corba, \
-    MAIN_CLASS  := com.sun.corba.se.impl.naming.cosnaming.TransientNameServer, \
+    MAIN_CLASS := com.sun.corba.se.impl.naming.cosnaming.TransientNameServer, \
     JAVA_ARGS := \
         -Dcom.sun.CORBA.activation.DbDir=./orb.db \
         -Djava.util.logging.LoggingPermission=contol \
--- a/make/launcher/Launcher-java.desktop.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-java.desktop.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -30,8 +30,7 @@
 
 ifndef BUILD_HEADLESS_ONLY
   $(eval $(call SetupBuildLauncher, appletviewer, \
-      MAIN_MODULE := java.desktop, \
-      MAIN_CLASS  := sun.applet.Main, \
+      MAIN_CLASS := sun.applet.Main, \
       JAVA_ARGS := -addmods ALL-SYSTEM, \
       LIBS_unix := $(X_LIBS), \
   ))
--- a/make/launcher/Launcher-java.rmi.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-java.rmi.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,11 +26,9 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, rmid, \
-    MAIN_MODULE := java.rmi, \
-    MAIN_CLASS  := sun.rmi.server.Activation, \
+    MAIN_CLASS := sun.rmi.server.Activation, \
 ))
 
 $(eval $(call SetupBuildLauncher, rmiregistry, \
-    MAIN_MODULE := java.rmi, \
-    MAIN_CLASS  := sun.rmi.registry.RegistryImpl, \
+    MAIN_CLASS := sun.rmi.registry.RegistryImpl, \
 ))
--- a/make/launcher/Launcher-java.scripting.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-java.scripting.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,6 +26,5 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jrunscript, \
-    MAIN_MODULE := java.scripting, \
-    MAIN_CLASS  := com.sun.tools.script.shell.Main, \
+    MAIN_CLASS := com.sun.tools.script.shell.Main, \
 ))
--- a/make/launcher/Launcher-java.security.jgss.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-java.security.jgss.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -27,17 +27,14 @@
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   $(eval $(call SetupBuildLauncher, kinit, \
-      MAIN_MODULE := java.security.jgss, \
-      MAIN_CLASS  := sun.security.krb5.internal.tools.Kinit, \
+      MAIN_CLASS := sun.security.krb5.internal.tools.Kinit, \
   ))
 
   $(eval $(call SetupBuildLauncher, klist, \
-      MAIN_MODULE := java.security.jgss, \
-      MAIN_CLASS  := sun.security.krb5.internal.tools.Klist, \
+      MAIN_CLASS := sun.security.krb5.internal.tools.Klist, \
   ))
 
   $(eval $(call SetupBuildLauncher, ktab, \
-      MAIN_MODULE := java.security.jgss, \
-      MAIN_CLASS  := sun.security.krb5.internal.tools.Ktab, \
+      MAIN_CLASS := sun.security.krb5.internal.tools.Ktab, \
   ))
 endif
--- a/make/launcher/Launcher-jdk.compiler.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.compiler.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,22 +26,19 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, javac, \
-    MAIN_MODULE := jdk.compiler, \
-    MAIN_CLASS  := com.sun.tools.javac.Main, \
+   MAIN_CLASS := com.sun.tools.javac.Main, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS \
         -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \
 ))
 
 $(eval $(call SetupBuildLauncher, javah, \
-    MAIN_MODULE := jdk.compiler, \
-    MAIN_CLASS  := com.sun.tools.javah.Main, \
+    MAIN_CLASS := com.sun.tools.javah.Main, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS \
         -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \
 ))
 
 $(eval $(call SetupBuildLauncher, serialver, \
-    MAIN_MODULE := jdk.compiler, \
-    MAIN_CLASS  := sun.tools.serialver.SerialVer, \
+    MAIN_CLASS := sun.tools.serialver.SerialVer, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
 ))
 
@@ -49,8 +46,7 @@
   # Build sjavac directly to the exploded image so that it does not get included
   # into any real images
   $(eval $(call SetupBuildLauncher, sjavac, \
-      MAIN_MODULE := jdk.compiler, \
-      MAIN_CLASS  := com.sun.tools.sjavac.Main, \
+      MAIN_CLASS := com.sun.tools.sjavac.Main, \
       CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS \
           -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \
       OUTPUT_DIR := $(JDK_OUTPUTDIR)/bin, \
--- a/make/launcher/Launcher-jdk.hotspot.agent.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.hotspot.agent.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,14 +26,12 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jsadebugd, \
-    MAIN_MODULE := jdk.hotspot.agent, \
-    MAIN_CLASS  := sun.jvm.hotspot.jdi.SADebugServer, \
+    MAIN_CLASS := sun.jvm.hotspot.jdi.SADebugServer, \
     MACOSX_SIGNED := true, \
 ))
 
 
 $(eval $(call SetupBuildLauncher, jhsdb, \
-    MAIN_MODULE := jdk.hotspot.agent, \
-    MAIN_CLASS  := sun.jvm.hotspot.SALauncher, \
+    MAIN_CLASS := sun.jvm.hotspot.SALauncher, \
     MACOSX_SIGNED := true, \
 ))
--- a/make/launcher/Launcher-jdk.jartool.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.jartool.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,11 +26,9 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jar, \
-    MAIN_MODULE := jdk.jartool, \
-    MAIN_CLASS  := sun.tools.jar.Main, \
+    MAIN_CLASS := sun.tools.jar.Main, \
 ))
 
 $(eval $(call SetupBuildLauncher, jarsigner, \
-    MAIN_MODULE := jdk.jartool, \
-    MAIN_CLASS  := sun.security.tools.jarsigner.Main, \
+    MAIN_CLASS := sun.security.tools.jarsigner.Main, \
 ))
--- a/make/launcher/Launcher-jdk.javadoc.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.javadoc.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,8 +26,7 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, javadoc, \
-    MAIN_MODULE := jdk.javadoc, \
-    MAIN_CLASS  := com.sun.tools.javadoc.Main, \
+    MAIN_CLASS := com.sun.tools.javadoc.Main, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS \
         -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \
 ))
--- a/make/launcher/Launcher-jdk.jcmd.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.jcmd.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,8 +26,7 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jinfo, \
-    MAIN_MODULE := jdk.jcmd, \
-    MAIN_CLASS  := sun.tools.jinfo.JInfo, \
+    MAIN_CLASS := sun.tools.jinfo.JInfo, \
     JAVA_ARGS := \
         -Dsun.jvm.hotspot.debugger.useProcDebugger \
         -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
@@ -36,8 +35,7 @@
 ))
 
 $(eval $(call SetupBuildLauncher, jmap, \
-    MAIN_MODULE := jdk.jcmd, \
-    MAIN_CLASS  := sun.tools.jmap.JMap, \
+    MAIN_CLASS := sun.tools.jmap.JMap, \
     JAVA_ARGS := \
         -Dsun.jvm.hotspot.debugger.useProcDebugger \
         -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
@@ -46,13 +44,11 @@
 ))
 
 $(eval $(call SetupBuildLauncher, jps, \
-    MAIN_MODULE := jdk.jcmd, \
-    MAIN_CLASS  := sun.tools.jps.Jps, \
+    MAIN_CLASS := sun.tools.jps.Jps, \
 ))
 
 $(eval $(call SetupBuildLauncher, jstack, \
-    MAIN_MODULE := jdk.jcmd, \
-    MAIN_CLASS  := sun.tools.jstack.JStack, \
+    MAIN_CLASS := sun.tools.jstack.JStack, \
     JAVA_ARGS := \
         -Dsun.jvm.hotspot.debugger.useProcDebugger \
         -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
@@ -61,11 +57,9 @@
 ))
 
 $(eval $(call SetupBuildLauncher, jstat, \
-    MAIN_MODULE := jdk.jcmd, \
-    MAIN_CLASS  := sun.tools.jstat.Jstat, \
+    MAIN_CLASS := sun.tools.jstat.Jstat, \
 ))
 
 $(eval $(call SetupBuildLauncher, jcmd, \
-    MAIN_MODULE := jdk.jcmd, \
-    MAIN_CLASS  := sun.tools.jcmd.JCmd, \
+    MAIN_CLASS := sun.tools.jcmd.JCmd, \
 ))
--- a/make/launcher/Launcher-jdk.jconsole.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.jconsole.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,8 +26,7 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jconsole, \
-    MAIN_MODULE := jdk.jconsole, \
-    MAIN_CLASS  := sun.tools.jconsole.JConsole, \
+    MAIN_CLASS := sun.tools.jconsole.JConsole, \
     JAVA_ARGS := -Djconsole.showOutputViewer, \
     CFLAGS_windows := -DJAVAW, \
     LIBS_windows := user32.lib, \
--- a/make/launcher/Launcher-jdk.jdeps.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.jdeps.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,15 +26,13 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, javap, \
-    MAIN_MODULE := jdk.jdeps, \
-    MAIN_CLASS  := com.sun.tools.javap.Main, \
+    MAIN_CLASS := com.sun.tools.javap.Main, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS \
         -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \
 ))
 
 $(eval $(call SetupBuildLauncher, jdeps, \
-    MAIN_MODULE := jdk.jdeps, \
-    MAIN_CLASS  := com.sun.tools.jdeps.Main, \
+    MAIN_CLASS := com.sun.tools.jdeps.Main, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS \
         -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \
 ))
--- a/make/launcher/Launcher-jdk.jdi.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.jdi.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,6 +26,5 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jdb, \
-    MAIN_MODULE := jdk.jdi, \
-    MAIN_CLASS  := com.sun.tools.example.debug.tty.TTY, \
+    MAIN_CLASS := com.sun.tools.example.debug.tty.TTY, \
 ))
--- a/make/launcher/Launcher-jdk.jlink.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.jlink.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,22 +26,19 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jimage,\
-    MAIN_MODULE := jdk.jlink, \
-    MAIN_CLASS  := jdk.tools.jimage.Main, \
+    MAIN_CLASS := jdk.tools.jimage.Main, \
     CFLAGS := -DENABLE_ARG_FILES, \
 ))
 
 $(eval $(call SetupBuildLauncher, jlink,\
-    MAIN_MODULE := jdk.jlink, \
-    MAIN_CLASS  := jdk.tools.jlink.Main, \
+    MAIN_CLASS := jdk.tools.jlink.Main, \
     CFLAGS := -DENABLE_ARG_FILES \
         -DEXPAND_CLASSPATH_WILDCARDS \
         -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \
 ))
 
 $(eval $(call SetupBuildLauncher, jmod,\
-    MAIN_MODULE := jdk.jlink, \
-    MAIN_CLASS  := jdk.tools.jmod.Main, \
+    MAIN_CLASS := jdk.tools.jmod.Main, \
     CFLAGS := -DENABLE_ARG_FILES \
         -DEXPAND_CLASSPATH_WILDCARDS \
         -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \
--- a/make/launcher/Launcher-jdk.jshell.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.jshell.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,8 +26,7 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jshell, \
-    MAIN_MODULE := jdk.jshell, \
-    MAIN_CLASS  := jdk.internal.jshell.tool.JShellTool, \
+    MAIN_CLASS := jdk.internal.jshell.tool.JShellTool, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS \
         -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \
 ))
--- a/make/launcher/Launcher-jdk.jvmstat.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.jvmstat.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,6 +26,5 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jstatd, \
-    MAIN_MODULE := jdk.jvmstat, \
-    MAIN_CLASS  := sun.tools.jstatd.Jstatd, \
+    MAIN_CLASS := sun.tools.jstatd.Jstatd, \
 ))
--- a/make/launcher/Launcher-jdk.pack200.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.pack200.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -27,7 +27,7 @@
 
 $(eval $(call SetupBuildLauncher, pack200, \
     MAIN_MODULE := java.base, \
-    MAIN_CLASS  := com.sun.java.util.jar.pack.Driver, \
+    MAIN_CLASS := com.sun.java.util.jar.pack.Driver, \
 ))
 
 ################################################################################
--- a/make/launcher/Launcher-jdk.policytool.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.policytool.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -27,8 +27,7 @@
 
 ifndef BUILD_HEADLESS_ONLY
   $(eval $(call SetupBuildLauncher, policytool, \
-      MAIN_MODULE := jdk.policytool, \
-      MAIN_CLASS  := sun.security.tools.policytool.PolicyTool, \
+      MAIN_CLASS := sun.security.tools.policytool.PolicyTool, \
       LIBS_unix := $(X_LIBS), \
   ))
 endif
--- a/make/launcher/Launcher-jdk.rmic.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.rmic.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,7 +26,6 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, rmic, \
-    MAIN_MODULE := jdk.rmic, \
-    MAIN_CLASS  := sun.rmi.rmic.Main, \
+    MAIN_CLASS := sun.rmi.rmic.Main, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
 ))
--- a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,7 +26,6 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jjs, \
-    MAIN_MODULE := jdk.scripting.nashorn.shell, \
-    MAIN_CLASS  := jdk.nashorn.tools.jjs.Main, \
+    MAIN_CLASS := jdk.nashorn.tools.jjs.Main, \
     CFLAGS := -DENABLE_ARG_FILES, \
 ))
--- a/make/launcher/Launcher-jdk.xml.bind.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.xml.bind.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,11 +26,9 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, schemagen, \
-    MAIN_MODULE := jdk.xml.bind, \
-    MAIN_CLASS  := com.sun.tools.internal.jxc.SchemaGenerator, \
+    MAIN_CLASS := com.sun.tools.internal.jxc.SchemaGenerator, \
 ))
 
 $(eval $(call SetupBuildLauncher, xjc, \
-    MAIN_MODULE := jdk.xml.bind, \
-    MAIN_CLASS  := com.sun.tools.internal.xjc.Driver, \
+    MAIN_CLASS := com.sun.tools.internal.xjc.Driver, \
 ))
--- a/make/launcher/Launcher-jdk.xml.ws.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/Launcher-jdk.xml.ws.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -26,11 +26,9 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, wsgen, \
-    MAIN_MODULE := jdk.xml.ws, \
-    MAIN_CLASS  := com.sun.tools.internal.ws.WsGen, \
+    MAIN_CLASS := com.sun.tools.internal.ws.WsGen, \
 ))
 
 $(eval $(call SetupBuildLauncher, wsimport, \
-    MAIN_MODULE := jdk.xml.ws, \
-    MAIN_CLASS  := com.sun.tools.internal.ws.WsImport, \
+    MAIN_CLASS := com.sun.tools.internal.ws.WsImport, \
 ))
--- a/make/launcher/LauncherCommon.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/launcher/LauncherCommon.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -62,7 +62,8 @@
 # used as the name of the executable.
 #
 # Remaining parameters are named arguments. These include:
-# MAIN_MODULE  The module of the main class to launch
+# MAIN_MODULE  The module of the main class to launch if different from the 
+#     current module
 # MAIN_CLASS   The Java main class to launch
 # JAVA_ARGS   Processed into a -DJAVA_ARGS C flag
 # APP_CLASSPATH   Processed into a -DAPP_CLASSPATH C flag
@@ -98,15 +99,13 @@
     $1_JAVA_ARGS += -ms8m
   endif
 
-  ifneq ($$($1_MAIN_MODULE), )
-    $1_MODULE_MAIN_CLASS := -m $$($1_MAIN_MODULE)/$$($1_MAIN_CLASS)
-  else
-    $1_MODULE_MAIN_CLASS := $$($1_MAIN_CLASS)
+  ifeq ($$($1_MAIN_MODULE), )
+    $1_MAIN_MODULE := $(MODULE)
   endif
 
   ifneq ($$($1_JAVA_ARGS), )
     $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \
-        $$(addprefix -J, $$($1_JAVA_ARGS)) $$($1_MODULE_MAIN_CLASS), "$$a"$(COMMA) )) }'
+        $$(addprefix -J, $$($1_JAVA_ARGS)) -m $$($1_MAIN_MODULE)/$$($1_MAIN_CLASS), "$$a"$(COMMA) )) }'
     $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR)
   endif
 
@@ -136,7 +135,7 @@
   endif
 
   ifeq ($(OPENJDK_TARGET_OS), aix)
-    $1_LDFLAGS_SUFFIX += -L$(NATIVE_OUTPUTDIR)/java.base -ljli_static
+    $1_LDFLAGS += -L$(NATIVE_OUTPUTDIR)/java.base
     $1_LIBS += -ljli_static
   endif
 
--- a/make/lib/CoreLibraries.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/lib/CoreLibraries.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -261,7 +261,7 @@
         -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
         -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
         -I$(JDK_TOPDIR)/src/java.base/share/native/libjimage \
-        -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
+        -I$(HEADERS_OUTPUTDIR)/java.base, \
     CFLAGS_unix := -UDEBUG, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
--- a/make/lib/Lib-java.instrument.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/lib/Lib-java.instrument.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -76,7 +76,7 @@
     LIBS_macosx := -liconv -framework Cocoa -framework Security \
         -framework ApplicationServices, \
     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib \
-        $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib, \
+        $(NATIVE_OUTPUTDIR)/java.base/jli_static.lib, \
     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
     RC_FLAGS := $(RC_FLAGS) \
         -D "JDK_FNAME=instrument.dll" \
--- a/make/lib/Lib-jdk.crypto.ucrypto.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/lib/Lib-jdk.crypto.ucrypto.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -43,7 +43,7 @@
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(LIBDL), \
       LIBS_solaris := -lc, \
-      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \
+      OBJECT_DIR := $(NATIVE_OUTPUTDIR)/$(MODULE)/libj2ucrypto, \
       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
 
   $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)
--- a/make/lib/Lib-jdk.internal.le.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/lib/Lib-jdk.internal.le.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -33,7 +33,7 @@
       #
   LIBLE_CPPFLAGS := \
       $(addprefix -I, $(LIBLE_SRC)) \
-      -I$(SUPPORT_OUTPUTDIR)/headers/jdk.internal.le \
+      -I$(HEADERS_OUTPUTDIR)/jdk.internal.le \
       #
 
   $(eval $(call SetupNativeCompilation,BUILD_LIBLE, \
--- a/make/lib/SecurityLibraries.gmk	Tue Nov 17 16:26:23 2015 +0100
+++ b/make/lib/SecurityLibraries.gmk	Tue Nov 17 16:38:11 2015 +0100
@@ -32,7 +32,7 @@
   LIBOSXSECURITY_DIRS := $(JDK_TOPDIR)/src/java.base/macosx/native/libosxsecurity
   LIBOSXSECURITY_CFLAGS := -I$(LIBOSXSECURITY_DIRS) \
       $(LIBJAVA_HEADER_FLAGS) \
-      -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
+      -I$(HEADERS_OUTPUTDIR)/java.base \
 
   $(eval $(call SetupNativeCompilation,BUILD_LIBOSXSECURITY, \
       LIBRARY := osxsecurity, \
@@ -43,7 +43,7 @@
           $(LIBOSXSECURITY_CFLAGS), \
       DISABLED_WARNINGS_clang := deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
-          -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
+          -L$(MODULES_LIBS_OUTPUTDIR)/java.base \
           $(call SET_SHARED_LIBRARY_ORIGIN) \
           -fobjc-link-runtime, \
       LIBS := \