X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=207d2040b9b9a1e0be2b67926b4f0c07c17db210;hb=0a3ca0b143d5742208e6dc922104d897a7647464;hp=dc019ac12f1173bb7888a28de9adddf018c24cc6;hpb=e4271cfa389d30295b1e2c8c41e9060674a75117;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index dc019ac..207d204 100644
--- a/Makefile
+++ b/Makefile
@@ -43,15 +43,12 @@ gcc_optimizations  := -O2
 #gcc_optimizations  := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
 #gcc_optimizations  += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
 
-gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target)
-gcc_flags          += -Iupstream/install/$(target)/include -Iupstream/install/lib/gcc-lib/$(target)/3.3/include
-gcc_flags          += -Iupstream/install/include -Ibuild/class
-gcj_flags          := -fCLASSPATH=build/java
-g++_flags          := -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -Wno-multichar
-gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src -Iupstream/jpeg-6b/build-$(target)
+gcc_flags          += -Iupstream/install/lib/gcc-lib/$(target)/3.3/include -Iupstream/install/$(target)/include
+gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) -fCLASSPATH=build/java
 gcjh               := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh
-g++                := upstream/install/bin/$(target)-gcj $(gcc_flags)
-gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags) $(g++_flags)
+g++                := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar
+gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags)
 jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
 gcj: .install_gcc-3.3_$(target); make $(target_bin) link_flags="$(link_flags)" platform=$(platform)
@@ -263,7 +260,7 @@ dist: compile
 		echo "*  This build is $(current_build)                                     *"
 		echo "***********************************************************"
 		cvs commit -m '' > /dev/null     # this will fail if we haven't checked-in since the comment is null; we want this.
-		echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\
+		echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs -d /cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\
 			 ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
 else
 	(echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-