bugfix in Makefile.common

darcs-hash:20040720085016-5007d-0d3779bd38614191f1ae7e59060bbfbfffaa02cd.gz

diff --git a/Makefile.common b/Makefile.common
index cccc190..2eddb2e 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -18,7 +18,7 @@ repo/: ; mkdir repo
 repo/%.ibex.org/: repo/
        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
 repo/%.ibex.org/: repo/
        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/$*
+       test -e src/org/ibex/$* || (cd src/org/ibex; ln -sf ../../../repo/$*.ibex.org/src/org/ibex/$*); true

 
 
 ### cleanup targets ##################################################################
 
 
 ### cleanup targets ##################################################################

@@ -41,7 +41,7 @@ compile: .compile
 .compile: $(java_sources) build/class/org/ibex/util/Preprocessor.class
        make -s repos
        java -cp build/class org.ibex.util.Preprocessor $(java_sources)
 .compile: $(java_sources) build/class/org/ibex/util/Preprocessor.class
        make -s repos
        java -cp build/class org.ibex.util.Preprocessor $(java_sources)

-       $(javac) $(java_sources:src/%.java=build/java/%.java)
+       $(javac) -d build/class $(java_sources:src/%.java=build/java/%.java)

        touch $@
 
 
        touch $@