X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=c55a2dbd88de06d79d81c9643d42885ea7388f50;hb=c40cc244dc85706fb2227db695dfed84f08e5faf;hp=9ad8b4cb33c4ef9ce0661c45d9da59ec95d1284c;hpb=9835d9bbac931f8e76ad377674fb47a7f0da01e3;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 9ad8b4c..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 | \
@@ -171,7 +171,7 @@ src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.pa
 	cd src/org/ijg/; tar xzf jpegsrc.v6b.tar.gz
 	cd src/org/ijg/jpeg-6b; ./configure --target=$(target)
 	cd src/org/ijg/jpeg-6b; mv $(jpeg_c_sources) $(jpeg_headers) ..
-	cd src/org/ijg; patch -p0 < jmorecfg.h.patch
+	cd src/org/ijg; patch -l -p0 < jmorecfg.h.patch
 	rm -rf src/org/ijg/jpeg-6b
 
 $(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
@@ -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)
@@ -293,11 +294,11 @@ dist-private:
 	make $(silent) update-build
 
 	# preserve gcc across builds so we don't have to remake it
-	mv gcc/Makefile Makefile.gcc
 	mkdir -p $(HOME)/dist.xwt.org-gcc
-	rm -rf gcc
+	mv gcc gcc-
 	ln -s $(HOME)/dist.xwt.org-gcc gcc
-	mv Makefile.gcc gcc/Makefile
+	mv -f gcc-/Makefile gcc/
+	mv -f gcc-/gcc.patch gcc/
 
 	# build it
 	nice -n 19 make all