6855953: JDK7 - merger error of deployment changes with b62 -in jdk/make/sun/Makefile
This problem was discovered testing initial changeset for implementing 6uX Deployment Features into JDK7 Reviewed-by: dgu, billyh
This commit is contained in:
parent
974a4682e4
commit
84c0ca5fa8
@ -59,7 +59,7 @@ else
|
|||||||
RENDER_SUBDIR = dcpr
|
RENDER_SUBDIR = dcpr
|
||||||
endif
|
endif
|
||||||
# nio need to be compiled before awt to have all charsets ready
|
# 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) \
|
nio awt splashscreen $(XAWT_SUBDIR) \
|
||||||
$(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
|
$(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
|
||||||
font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
|
font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
|
||||||
|
Loading…
Reference in New Issue
Block a user