X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=5fc54175f8d11a38b535ef277f24fb34b0542bae;hp=2d2719b42bcf01766e4532ec22ee6719dd10fa3b;hb=07f137d5694c7d52a6a2c28e051546232b353f5d;hpb=e2dab289d7adfebb01adf5ce782e7fa1b122cded

diff --git a/Makefile.upstream b/Makefile.upstream
index 2d2719b..5fc5417 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -18,7 +18,7 @@ url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-2003072
 url_vera-1.10          := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz
 url_jode-1.1.1         := http://umn.dl.sourceforge.net/sourceforge/jode/jode-1.1.1.tar.gz
 url_java-getopt-1.0.9  := ftp://ftp.urbanophile.com/pub/arenn/software/sources/java-getopt-1.0.9.tar.gz
-url_WindowMaker-0.80.2 := ftp://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz
+url_WindowMaker-0.80.2 := http://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz
 
 .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
 	rm -rf upstream/darwin-linker/src
@@ -75,6 +75,9 @@ configure_gcc-3.3_i686-pc-mingw32       += --enable-threads=win32 --enable-hash-
 configure_gcc-3.3_i686-pc-linux-gnu     += --enable-threads=posix --enable-hash-synchronization
 configure_gcc-3.3_sparc-sun-solaris2.7  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
 
+configure_WindowMaker-0.80.2_$(target)  += --prefix=$(shell pwd)/upstream/install/$(target)
+configure_WindowMaker-0.80.2_$(target)  += --host=i686-pc-linux-gnu --x-libraries=$(shell pwd)/upstream/install/$(target)/lib
+
 .install_jode-1.1.1_java: .download_java-getopt-1.0.9
 
 configure_jode-1.1.1_java               := --with-java=$(JAVA_HOME)/bin/java --with-javac=$(JAVA_HOME)/bin/javac
@@ -98,6 +101,15 @@ environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$(
 environment_libmspack-20030726_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
 environment_libmspack-20030726_$(target) += OPTIM="-ffunction-sections -fdata-sections -O3"
 
+# WindowMaker configury doesn't obey --target
+environment_WindowMaker-0.80.2_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
+environment_WindowMaker-0.80.2_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
+environment_WindowMaker-0.80.2_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar"
+environment_WindowMaker-0.80.2_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
+environment_WindowMaker-0.80.2_$(target) += LDFLAGS="-lXext"
+make_install_WindowMaker-0.80.2_$(target) := -C WINGs install; make -C wrlib
+make_WindowMaker-0.80.2_$(target) := WINGs
+
 environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bin:$$PATH
 
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
@@ -195,7 +207,7 @@ endif
 	cd upstream/$*/build-$(target); \
 		$(setcc) PATH=$$PATH:`pwd`/../../install/bin \
 		$(environment_$*_$(target)) \
-		make $(setcc) $(environment_$*_$(target))
+		make $(make_$*_$(target)) $(setcc) $(environment_$*_$(target))
 	touch $@
 
 .install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true
@@ -205,7 +217,7 @@ endif
 	cd upstream/$*/build-$(target); \
 		$(setcc) PATH=$$PATH:`pwd`/../../install/bin \
 		$(environment_$*_$(target)) \
-		make install $(setcc) $(environment_$*_$(target))
+		make $(make_install_$*_$(target)) install $(setcc) $(environment_$*_$(target))
 	touch $@
 
 # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH