From eb0b237ccfd75f83e6742f94602c166297710ad7 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 16 Apr 2004 02:22:17 +0000 Subject: [PATCH 1/1] fix bug 548 darcs-hash:20040416022217-5007d-2726d9194ac2ce6e3404a3386e207fdb7292fe60.gz --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b6760b7..8b85eb5 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ target := $(target_$(platform)) all: Java2 Linux Win32 Darwin Solaris -clean: ; rm -rf build; rm build/class/org/ibex/util/Preprocessor.class +clean: ; rm -rf build dist-clean: rm -rf .configure* .install* build .compile .build* find upstream -name config.cache -exec rm -f {} \; @@ -101,7 +101,7 @@ plat_classes_Solaris := org.ibex.plat.Solaris $(plat_classes_X11) plat_classes_Darwin := org.ibex.plat.Darwin org.ibex.plat.OpenGL $(plat_classes_POSIX) plat_java_src_sources := $(patsubst %,build/java/%.java,$(subst .,/,$(plat_classes_$(platform)))) -java_src_sources := $(shell find src -name '*.java' | grep -v Preprocessor | grep -v /plat/) +java_src_sources := $(shell find src -name '*.java' | grep -v NanoGoat | grep -v Preprocessor | grep -v /plat/) java_src_sources += $(plat_java_src_sources) java_sources := $(patsubst src/%.java, build/java/%.java, $(java_src_sources)) @@ -172,7 +172,7 @@ $(call link_upstream,org/ibex/crypto/%.java,upstream/org.ibex.crypto/src,.downlo $(call link_upstream,org/ibex/net/ssl/%.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto) $(call link_upstream,org/ibex/net/SSL.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto) $(call link_upstream,gnu/regexp/%.java,upstream/gnu.regexp-1.1.4/src/src) -build/java/org/ibex/%.java: src/org/ibex/%.java build/class/org/ibex/util/Preprocessor.class +build/java/org/ibex/%.java: src/org/ibex/%.java .download_gnu.regexp-1.1.4 build/class/org/ibex/util/Preprocessor.class @echo -e "\033[1mpreprocessing .java -> .java: $<\033[0m" mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.util.Preprocessor < $< > $@ $(call link_upstream,%.java,src) -- 1.7.10.4