X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=e0a2a23c3d08d75924333600e882c85eb6fa96c0;hb=fa9b47fdfcfd055b2027f5aa49bfb68209a00e1b;hp=841b277632740f8182e2f7ff678f4b4ab181f2fa;hpb=a2caad030429ce29a7aa82f6b4b65dd80261be6b;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 841b277..e0a2a23 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ c_objects              := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
 gcc_path               := $(shell pwd)/gcc/install
 #gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions
 #gcc_optimzations       += -funroll-loops -ffunction-sections -fdata-sections
-gcc_optimizations      := -O0
+gcc_optimizations      := -O2
 debug                  := 
 gcc_flags              := $(gcc_optimizations) $(debug) -Isrc/org/ijg
 gcj_flags              := -fCLASSPATH=bin 
@@ -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)