X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=d1edd07e85a9cb55b0c2173123516e0957a6e9c1;hb=a2e25a07054d1cdfc94499935b1e00750b84ddba;hp=6a77ee941f06f14ec2b9ba38b4c25d30e51748f5;hpb=3727c0af80c2efa699c454f07c5c3cb3fad8f98f;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 6a77ee9..d1edd07 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ ## Configurables ########################################################################### # inputs -javac_java_sources := $(shell find src -name *.java) -gcj_java_sources := $(shell find src -name *.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources) +javac_java_sources := $(shell find src -name \*.java) +gcj_java_sources := $(shell find src -name \*.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources) xwar_sources := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf) cc_sources := src/org/xwt/plat/$(platform).cc @@ -142,12 +142,12 @@ link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g $(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(javac_java_objects) - echo -ne "compiling .java -> .o: $<" + echo "compiling .java -> .o: $<" mkdir -p `dirname $@` $(gcj) -c $< -o $@ $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc - echo -ne "compiling .cc -> .o: $$A" + echo "compiling .cc -> .o: $$A" $(gcc) -Ibin -c $< -o $@ bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar @@ -208,7 +208,7 @@ dist: echo "* This build is $(current_build)" echo "***********************************************************" - ifeq ($(shell uname -n),gosset.megacz.com) + ifeq ($(shell uname -n),serverbeach.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 | \