updated Makefile.common

darcs-hash:20040713022512-5007d-9fd9cf5dde2839968a7eb28769dacbf2b79130ca.gz

diff --git a/Makefile.common b/Makefile.common
index d7275b8..cccc190 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -9,17 +9,16 @@ realdefault: default
 ### interproject deps #############################################################
 
 cmd := find src -name \*.java -exec grep '^import org.ibex.' {} \;
-cmd +=  | sed 's_import org\.ibex\.\([a-z]*\).*_ src/org/ibex/\1\n_'
+cmd +=  | sed 's_import org\.ibex\.\([a-z]*\).*_ repo/\1.ibex.org/\n_'
 cmd +=  | sort | uniq | (while read A; do test -e $$A || echo $$A; done)
 $(eval upstream := $(shell $(cmd)))
 
 repos: $(upstream)
 repo/: ; mkdir repo
 repo/%.ibex.org/: repo/
-       cd repo; darcs get --partial --verbose http://$*.ibex.org/
-src/org/ibex/%/:  repo/%.ibex.org/
-       cd repo/$*.ibex.org; darcs pull -a --verbose http://$*.ibex.org/ 
-       cd src/org/ibex; ln -sf ../../../repo/$*.ibex.org/src $*
+       test -e $@ && (cd repo/$*.ibex.org; darcs pull -a --verbose http://$*.ibex.org/); true
+       test -e $@ || (cd repo; darcs get --partial --verbose http://$*.ibex.org/); true
+       cd src/org/ibex; ln -sf ../../../repo/$*.ibex.org/src/org/ibex/$*
 
 
 ### cleanup targets ##################################################################
@@ -33,10 +32,16 @@ dist-clean: ; rm -rf build .compile
 javac := javac
 java_sources := $(shell find src/org/ibex/*/ -name \*.java)
 
+src/org/ibex/util/Preprocessor.java: repo/util.ibex.org/
+build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java
+       mkdir -p build/class/
+       $(javac) -d build/class/ $<
+
 compile: .compile
-.compile: $(sources)
+.compile: $(java_sources) build/class/org/ibex/util/Preprocessor.class
        make -s repos
-       $(javac) $(java_sources)
+       java -cp build/class org.ibex.util.Preprocessor $(java_sources)
+       $(javac) $(java_sources:src/%.java=build/java/%.java)
        touch $@