From: adam <adam@megacz.com>
Date: Fri, 16 Apr 2004 02:22:17 +0000 (+0000)
Subject: fix bug 548
X-Git-Tag: 01-July-2005~144
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=eb0b237ccfd75f83e6742f94602c166297710ad7;hp=538f919137a5241bfe8564eeac6a030f84383e06

fix bug 548

darcs-hash:20040416022217-5007d-2726d9194ac2ce6e3404a3386e207fdb7292fe60.gz
---

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)