From 29058bd93a808918b69221590a44e6fce48e84f8 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:40:04 +0000 Subject: [PATCH] 2003/10/28 09:57:25 darcs-hash:20040130074004-2ba56-1c9e69642ca10a3881275330ed9d5dcbf4581ced.gz --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 615d511..30ae3b4 100644 --- a/Makefile +++ b/Makefile @@ -53,12 +53,11 @@ java_sources := $(all_java_sources) nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources)) plat_java_sources := $(filter build/java/org/xwt/plat/%, $(all_java_sources)) -# FIXME: must have a relitavely new GNU sed... Apple sed fails silently (why?) -build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@ -build/cc/%.cc: src/%.c ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@ +build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@ +build/cc/%.cc: src/%.c ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@ build/c/jpeg/%.c: upstream/jpeg-6b/src/%.c - @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@ -build/res/%: src/% ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@ + @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@ +build/res/%: src/% ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@ build/java/%.java: src/%.java.pp make build/class/org/xwt/util/Preprocessor.class @@ -317,6 +316,6 @@ dist-private: # this is for Adam; don't mess with it -test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://www.megacz.com/tmp/demo.xwar - +test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar +#test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar -- 1.7.10.4