2003/06/18 06:02:39

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index e3ac858..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 $@`
@@ -269,7 +273,8 @@ current_build         := $(shell cat next.build)
 this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
 this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
 
-dist:
+# pre-depend on compile as a sanity check
+dist: compile
        # this will fail if we haven't checked-in since the comment is null; we want this.
        cvs commit -m '' > /dev/null
        cvs tag -F xwt-$(current_build)