fix erroneous search-replace

[org.ibex.core.git] / Makefile.common

diff --git a/Makefile.common b/Makefile.common
index cccc190..c777d9d 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
-       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 ##################################################################
@@ -37,11 +37,15 @@ build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.jav
        mkdir -p build/class/
        $(javac) -d build/class/ $<
 
+# HACK
+java_sources_pp := $(filter-out src/org/ibex/net/ssl/RootCerts.java,$(java_sources))
 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)
-       $(javac) $(java_sources:src/%.java=build/java/%.java)
+       java -cp build/class org.ibex.util.Preprocessor $(java_sources_pp)
+       test -e src/org/ibex/net/ssl/RootCerts.java && \
+               cp src/org/ibex/net/ssl/RootCerts.java build/java/org/ibex/net/ssl/RootCerts.java
+       $(javac) -d build/class $(java_sources:src/%.java=build/java/%.java)
        touch $@
 
 
@@ -59,6 +63,10 @@ propose-patch:
 commit: propose-patch
        darcs push xwt@xwt.org:/var/www/org/ibex/core/
 
+pull:;     darcs pull            cd repo; for A in *.ibex.org; do cd $$A; darcs pull http://$$A/; cd ..; done
+whatsnew:; darcs whatsnew; true; cd repo; for A in *.ibex.org; do echo; echo $$A; cd $$A; darcs whatsnew; cd ..; done
+record:;   darcs record;         cd repo; for A in *.ibex.org; do echo; echo $$A; cd $$A; darcs record; cd ..; done
+
 
 ### documentation ##########################################################