fixed dist dropoff location

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 19f1e40..6c2e7c2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ dist-clean:
        test -e upstream/mips && make -C upstream/mips clean
 
 JVM:        build/JVM/ibex.jar
-Linux:    ; make gcj platform=Linux   link_flags="-lX11 -lXext"
-Solaris:  ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
+Linux:    ; make gcj platform=Linux   link_flags="upstream/install/lib/libExtraWINGs.a upstream/install/lib/libWINGs.a upstream/install/lib/libwraster.a -L/usr/X11R6/lib -lXpm -lX11 -lXext"
+Solaris:  ; make gcj platform=Solaris link_flags="-Lupstream/install/sparc-sun-solaris2.7/lib/ upstream/install/sparc-sun-solaris2.7/lib/libExtraWINGs.a upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a upstream/install/sparc-sun-solaris2.7/lib/libwraster.a -lXpm -lX11 -lXext -lpthread"
 Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"
 Darwin:   ; make gcj platform=Darwin  link_flags="$(darwin_linker_flags)"
 
@@ -167,6 +167,10 @@ build/$(platform)/%.java.o: build/java/%.java
        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
 
+# FIXME detect subclasses of X11
+build/$(platform)/org/ibex/plat/Linux.cc.o: .install_WindowMaker-0.80.2_$(target) 
+build/$(platform)/org/ibex/plat/Solaris.cc.o: .install_WindowMaker-0.80.2_$(target) 
+
 build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).cc src/org/ibex/plat/*.cc .configure_jpeg-6b_$(target)
        @make $(java_headers)
        @echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
@@ -185,7 +189,7 @@ upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
 build/$(platform)/$(target_bin): build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/ibex/plat/$(platform).java.o
        @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
        mkdir -p build/$(platform)
-       PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.ibex.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
+       PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.ibex.Main -o $@ -Lupstream/install/$(target)/lib -Lupstream/install/lib $^ $(link_flags)
 
 
 ### Builtin Resources ##############################################################################
@@ -244,7 +248,7 @@ build/mips/mipsapps.mips: build/mips/org/ibex/translators/Freetype.c.o build/mip
 current_build         := $(shell cat next.build)
 strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
 strip_JVM       := cp build/$(platform)/$(target_bin)
-install-dist:;     $(strip_$(platform)) /var/www/master.dist.ibex.org/ibex-$(current_build).$(target_bin_extension).unsigned
+install-dist:;     $(strip_$(platform)) /var/www/org/xwt/dist/master/ibex-$(current_build).$(target_bin_extension).unsigned
 dist: compile
        (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
        mv next.build- next.build
@@ -260,9 +264,9 @@ dist: compile
 propose-patch:
        @darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://darcs.ibex.org/ibex/
        @(echo "To: patches@xwt.org";\
-        SUB=`grep -A2 New.patches .darcspatch | tail -n 1 | cut -b 2-`;\
+        SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\
         echo "Subject: $$SUB";\
         echo;\
-        cat .darcspatch) | cat > /tmp/foo #/usr/sbin/sendmail -bm -f $(USER)@xwt.org patches@xwt.org;
+        cat .darcspatch) | /usr/sbin/sendmail -bm -f $(USER)@xwt.org patches@xwt.org;
        @rm .darcspatch