diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile --- ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-30 16:49:39.000000000 +0000 +++ openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-30 16:59:16.000000000 +0000 @@ -294,11 +294,7 @@ TEMPDIR_CLASSES = $(TEMPDIR)/classes -$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java - @$(prep-target) - $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< - -$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) +$(TEMPDIR)/.gen_icons: $(ICONS) $(prep-target) for i in $(ICONS); do \ filename=`basename $$i`; \ @@ -308,20 +304,14 @@ $(ECHO) "package sun.awt.X11;" >> $$classname ; \ $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ $(ECHO) "public static int[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ - sun.awt.X11.ToBin >> $$classname; \ + $(ECHO) "0,0" >> $$classname ; \ $(ECHO) "}; }" >> $$classname; \ classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ $(RM) $$classname; \ $(ECHO) "package sun.awt.X11;" >> $$classname ; \ $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ $(ECHO) "public static long[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ - sun.awt.X11.ToBin >> $$classname; \ + $(ECHO) "0,0" >> $$classname ; \ $(ECHO) "}; }" >> $$classname; \ done $(TOUCH) $@