fixed bug 460

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

diff --git a/Makefile.upstream b/Makefile.upstream
index 2d2719b..c531107 100644 (file)
--- 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,16 +75,21 @@ 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
 ifeq ($(shell uname),Darwin)
-environment_jode-1.1.1_java             := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.1/Classes/classes.jar
+environment_jode-1.1.1_java             := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar
 else
 environment_jode-1.1.1_java             := CLASSLIB=${JAVA_HOME}/jre/lib/rt.jar
 endif
 environment_jode-1.1.1_java             += CLASSPATH=${CLASSPATH}:$(shell pwd)/upstream/java-getopt-1.0.9/
 
+#environment_gcc-3.3_i686-pc-linux-gnu   += CFLAGS="-Wl,-ldl"
+
 # libjpeg's configury doesn't obey --target
 environment_jpeg-6b_$(target)           += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
 environment_jpeg-6b_$(target)           += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
@@ -98,6 +103,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 -ldl"
+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)
@@ -112,8 +126,7 @@ vendor: .vendor; @true
        curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32
        curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32
 ifeq ($(shell uname),Linux)
-       rm -rf upstream/install/i686-pc-linux-gnu/include
-       ln -sf /usr/include upstream/install/i686-pc-linux-gnu/include
+       cd upstream/install/i686-pc-linux-gnu/include; rm -rf *; ln -sf /usr/include/* .
 endif
        touch .vendor
 
@@ -195,7 +208,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 +218,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