--- old/common/makefiles/Jprt.gmk	Fri Aug 16 10:34:24 2013
+++ new/common/makefiles/Jprt.gmk	Fri Aug 16 10:34:24 2013
@@ -23,7 +23,7 @@
 # questions.
 #
 
-# This file is included by the root NewerMakefile and contains targets 
+# This file is included by the root NewerMakefile and contains targets
 # and utilities needed by JPRT.
 
 # Utilities used in this Makefile. Most of this makefile executes without
@@ -150,7 +150,7 @@
   endif
   ifdef ALT_SPARKLE_FRAMEWORK_DIR
 	@$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
-  endif 
+  endif
 endif
 	@if [ -f $@ ] ; then \
           if ! $(CMP) $@ $@.tmp > /dev/null ; then \
@@ -175,6 +175,24 @@
 
 # These targets execute in a SPEC free context, before calling bridgeBuild
 # to generate the SPEC.
+jprt_build_productEmb:
+	$(MAKE) JAVASE_EMBEDDED=true MINIMIZE_RAM_USAGE=true jprt_build_product
+
+jprt_build_debugEmb:
+	$(MAKE) JAVASE_EMBEDDED=true MINIMIZE_RAM_USAGE=true jprt_build_debug
+
+jprt_build_fastdebugEmb:
+	$(MAKE) JAVASE_EMBEDDED=true MINIMIZE_RAM_USAGE=true jprt_build_fastdebug
+
+jprt_build_productOpen:
+	$(MAKE) OPENJDK=true jprt_build_product
+
+jprt_build_debugOpen:
+	$(MAKE) OPENJDK=true jprt_build_debug
+
+jprt_build_fastdebugOpen:
+	$(MAKE) OPENJDK=true jprt_build_fastdebug
+
 jprt_build_product: DEBUG_LEVEL=release
 jprt_build_product: BUILD_DIRNAME=*-release
 jprt_build_product: jprt_build_generic
--- old/make/jprt.properties	Fri Aug 16 10:34:25 2013
+++ new/make/jprt.properties	Fri Aug 16 10:34:25 2013
@@ -32,20 +32,58 @@
 jprt.windows.jdk8.build.unix.toolkit=cygwin
 
 # The different build flavors we want, we override here so we just get these 2
-jprt.build.flavors=product,fastdebug
+jprt.build.flavors=product,fastdebug,productEmb,fastdebugEmb,productOpen,debugOpen
 
+jprt.my.solaris.sparc=solaris_sparc_5.10
+jprt.my.solaris.sparcv9=solaris_sparcv9_5.10
+jprt.my.solaris.i586=solaris_i586_5.10
+jprt.my.solaris.x64=solaris_x64_5.10
+jprt.my.linux.i586=linux_i586_2.6
+jprt.my.linux.x64=linux_x64_2.6
+jprt.my.linux.ppc=linux_ppc_2.6
+jprt.my.linux.ppcv2=linux_ppcv2_2.6
+jprt.my.linux.ppcsflt=linux_ppcsflt_2.6
+jprt.my.linux.armvfpsflt=linux_armvfpsflt_2.6
+jprt.my.linux.armvfphflt=linux_armvfphflt_2.6
+jprt.my.linux.armvh=linux_armvh_2.6
+jprt.my.linux.armsflt=linux_armsflt_2.6
+jprt.my.macosx.x64=macosx_x64_10.7
+jprt.my.windows.i586=windows_i586_5.1
+jprt.my.windows.x64=windows_x64_5.2
+
 # Standard list of jprt build targets for this source tree
-jprt.build.targets= 						\
-    solaris_sparc_5.10-{product|fastdebug}, 			\
-    solaris_sparcv9_5.10-{product|fastdebug}, 			\
-    solaris_i586_5.10-{product|fastdebug}, 			\
-    solaris_x64_5.10-{product|fastdebug}, 			\
-    linux_i586_2.6-{product|fastdebug}, 			\
-    linux_x64_2.6-{product|fastdebug}, 				\
-    macosx_x64_10.7-{product|fastdebug}, 			\
-    windows_i586_5.1-{product|fastdebug}, 			\
-    windows_x64_5.2-{product|fastdebug}
 
+jprt.build.targets.standard= \
+    ${jprt.my.solaris.sparc}-{product|fastdebug}, \
+    ${jprt.my.solaris.sparcv9}-{product|fastdebug|optimized}, \
+    ${jprt.my.solaris.i586}-{product|fastdebug}, \
+    ${jprt.my.solaris.x64}-{product|fastdebug}, \
+    ${jprt.my.linux.i586}-{product|fastdebug}, \
+    ${jprt.my.linux.x64}-{product|fastdebug|optimized}, \
+    ${jprt.my.macosx.x64}-{product|fastdebug}, \
+    ${jprt.my.windows.i586}-{product|fastdebug}, \
+    ${jprt.my.windows.x64}-{product|fastdebug|optimized}, \
+    ${jprt.my.linux.armvh}-{product|fastdebug}
+
+jprt.build.targets.open= \
+    ${jprt.my.solaris.i586}-{productOpen}, \
+    ${jprt.my.solaris.x64}-{debugOpen}, \
+    ${jprt.my.linux.x64}-{productOpen}
+
+jprt.build.targets.embedded= \
+    ${jprt.my.linux.i586}-{productEmb|fastdebugEmb}, \
+    ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \
+    ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \
+    ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \
+    ${jprt.my.linux.armvfpsflt}-{productEmb|fastdebugEmb}, \
+    ${jprt.my.linux.armvfphflt}-{productEmb|fastdebugEmb}, \
+    ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb}
+
+jprt.build.targets.all=${jprt.build.targets.standard}, \
+    ${jprt.build.targets.embedded}, ${jprt.build.targets.open}
+
+jprt.build.targets=${jprt.build.targets.all}
+
 # User can select the test set with jprt submit "-testset name" option
 jprt.my.test.set=${jprt.test.set}