From b593f3eb93edddd3ae3394eb09595e61655bbb66 Mon Sep 17 00:00:00 2001 From: herrick Date: Mon, 29 Jun 2009 17:34:29 -0400 Subject: [PATCH] 6855953: JDK7 - merger error of deployment changes with b62 -in jdk/make/sun/Makefile Summary: This problem was discovered testing initial changeset for implementing 6uX Deployment Features into JDK7 Reviewed-by: dgu, billyh --- make/sun/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/sun/Makefile b/make/sun/Makefile index e5d62b68a..2e22bd803 100644 --- a/make/sun/Makefile +++ b/make/sun/Makefile @@ -59,7 +59,7 @@ else RENDER_SUBDIR = dcpr endif # nio need to be compiled before awt to have all charsets ready -SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \ +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) \ -- GitLab