2003/06/18 06:02:39

darcs-hash:20040130070143-2ba56-84d16bd5967db90d3fd3a9160ad1595b2bdb61a1.gz

diff --git a/Makefile b/Makefile
index c55a2db..e0a2a23 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -161,6 +161,10 @@ $(java_headers): bin/%.h: bin/%.class
                sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
                        xargs $(gcjh) --classpath .
 
+# special rule to stop GCJ from choking
+bin-$(platform)/org/xwt/SpecialBoxProperty.java.o: src/org/xwt/SpecialBoxProperty
+       $(gcj) -c bin/org/xwt/SpecialBoxProperty*.class -o bin-$(platform)/org/xwt/SpecialBoxProperty.java.o
+
 $(java_objects): bin-$(platform)/%.java.o: src/%.java
        @echo "compiling   .java -> .o:     $<"
        mkdir -p `dirname $@`

diff --git a/src/org/xwt/SpecialBoxProperty.java b/src/org/xwt/SpecialBoxProperty.java
index 16bba2e..cd86e3e 100644 (file)
--- a/src/org/xwt/SpecialBoxProperty.java
+++ b/src/org/xwt/SpecialBoxProperty.java
@@ -64,10 +64,6 @@ class SpecialBoxProperty {
     static final int white = 0xFFFFFFFF;
 
     static {
-        init();
-    }
-
-    private static void init() {
         specialBoxProperties.put("color", new SpecialBoxProperty() {
                 public Object get(Box b) {
                     if ((b.color & 0xFF000000) == 0) return null;