X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=a5b094f3b6248c55ecc5067008e3aa2a62b28dbc;hb=6440d675cc107ed11bef447596121ced4dcac189;hp=61588b4511e5c56d331da4dc5ad03fb54133e3ed;hpb=3d03fdab0b13a3b7abfbcb89bb8856eaf548bcfb;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 61588b4..a5b094f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ clean:
 	find upstream -name config.cache -exec rm {} \;
 
 JVM:        build/JVM/xwt.jar
-Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext"
+Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext --static"
 Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
 Win32:    ; make gcj platform=Win32   target=i686-pc-mingw32      link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
 Darwin:   ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)"
@@ -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.xwt.org/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