X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=da3ca8da38c3954595d6ca7b83b61ad39b3a4a1b;hb=8d8b2d3288652dc6efcb4f62915614f6fdb11668;hp=14e2463a16f0d5209d0b5155197b754fb569f237;hpb=d7955902243a04551f75b0f14d0583a61f3d31b4;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 14e2463..da3ca8d 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ all: JVM Linux Win32 Darwin Solaris clean: rm -rf .jikes .configure* .install* build .compile .build* - find upstream -name config.cache -exec rm {}\; + find upstream -name config.cache -exec rm {} \; JVM: build/JVM/xwt.jar Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu link_flags="-lX11 -lXext" @@ -156,7 +156,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar # compile is here to force compilation of the .class files (they get used via -Ibuild) without # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes) -gcj: .vendor .install_gcc-3.3_$(target) $(target_bin) +gcj: .vendor .compile .install_gcc-3.3_$(target) $(target_bin) build/JVM/xwt.jar: .compile build/res/builtin.jar @echo -e "\n\033[1marchiving .class -> .jar: build/JVM/xwt.jar\033[0m" @@ -262,7 +262,7 @@ dist: compile echo "* This build is $(current_build)" echo "***********************************************************" - ifeq ($(shell uname -n),serverbeach.megacz.com) + ifeq ($(shell uname -n),megacz.com) (make $(silent) dist-private 2>&1) >> .make-dist.out || \ (tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false) tail -n 200 .make-dist.out | \