X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=c55a2dbd88de06d79d81c9643d42885ea7388f50;hp=8967d346d46d4c3720fdde555c30afaea951c0bf;hb=32473bd956f9bca69cfa7f860d65e4e2b439046f;hpb=04db5cd31e594cc12781038ebe9fece0110457bd diff --git a/Makefile b/Makefile index 8967d34..c55a2db 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 @@ -52,11 +52,11 @@ PATH := jikes-1.18/bin:$(PATH) ## Platform-Neutral ########################################################################### ifneq ($(verbose),true) -.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar .bootclasspath .javac $(target_bin) compile +.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile silent := --silent endif -compile: bin/org/xwt/builtin.xwar +compile: .javac .bootclasspath bin/org/xwt/builtin.xwar echo "compiling .java -> .class:" mkdir -p bin $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \ @@ -269,7 +269,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)