X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=664150121d31fee94c9cc421cecac94a6aad23ea;hp=d9677b81b396a7e00f38900c7c99bd3f1392f432;hb=9f2b65deaba43f12661f49039b46c31f74d7dcfc;hpb=d602d58d0fa307be96122e2fe4e0606015bd5d00 diff --git a/Makefile b/Makefile index d9677b8..6641501 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) | include Makefile.upstream # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses) -java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/util/Preprocessor.java')) +java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor)) all_java_sources := $(java_sources) nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(java_sources)) build/java/org/xwt/translators/Freetype.java build/java/org/xwt/translators/MSPack.java build/java/org/xwt/translators/MIPSApps.java @@ -147,7 +147,7 @@ build/$(platform)/$(platform).ar: $(java_objects) $(plat_java_sources:build/java @echo -e "\n\033[1marchiving .o -> .a\033[0m" mkdir -p build/$(platform) rm -f $@ - upstream/install/$(target)/bin/ar rc $@ $? + upstream/install/$(target)/bin/ar rc $@ $^ upstream/install/$(target)/bin/ranlib $@ $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar