2003/09/29 00:04:26

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

diff --git a/Makefile.upstream b/Makefile.upstream
index 620411c..2224f5d 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -67,10 +67,9 @@ configure_gcc-3.3                       += --disable-java-awt --disable-interpre
 ifneq ($(shell uname),$(platform))
 configure_gcc-3.3                       += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
 configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
-configure_gcc-3.3_powerpc-apple-darwin  += --with-headers=$(shell pwd)/upstream/install/$(target)/include
+configure_gcc-3.3                       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 endif
 configure_gcc-3.3_powerpc-apple-darwin  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
-configure_gcc-3.3_i686-pc-mingw32       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 configure_gcc-3.3_i686-pc-mingw32       += --enable-threads=win32 --enable-hash-synchronization
 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-multilib
@@ -87,7 +86,7 @@ environment_jpeg-6b_$(target)           += AR2=$(shell pwd)/upstream/install/$(t
 # libmspack configury doesn't obey --target
 environment_libmspack-20030726_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
 environment_libmspack-20030726_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
-environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar rc"
+environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar"
 environment_libmspack-20030726_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
 
 environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bin:$$PATH
@@ -103,6 +102,10 @@ vendor: .vendor; @true
        mkdir -p upstream/install/i686-pc-mingw32
        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
+endif
        touch .vendor
 
 .download_%:
@@ -124,22 +127,28 @@ vendor: .vendor; @true
                $(configure_$*_$(target))
        touch $@
 
-.install_libmspack-20030726_$(target): .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target)
-.configure_libmspack-20030726_$(target): .download_libmspack-20030726
+.configure_libmspack-20030726_$(target): .download_libmspack-20030726 .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target)
        mkdir -p upstream/libmspack-20030726/build-$(target)
        cd upstream/libmspack-20030726/build-$(target); ln -sf ../libmspack/mspack/* .
+       touch $@
+
+.install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target)
+       touch $@
 
 .install_freetype-2.1.4_mips-unknown-elf: .install_gcc-3.3_mips-unknown-elf .install_newlib-1.11.0_mips-unknown-elf .download_freetype-2.1.4
        cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../../install/bin make CC=mips-unknown-elf-gcc AR=mips-unknown-elf-ar
        upstream/install/bin/mips-unknown-elf-ranlib upstream/freetype-2.1.4/src/objs/libfreetype.a
        touch $@
 
-.install_%_$(target): .configure_%_$(target)
+.build_%_$(target): .configure_%_$(target)
        @echo -e "\n\033[1mbuilding $*...\033[0m"
        cd upstream/$*/build-$(target); \
                $(setcc) PATH=$$PATH:`pwd`/../../install/bin \
                $(environment_$*_$(target)) \
                make $(setcc) $(environment_$*_$(target))
+       touch $@
+
+.install_%_$(target): .build_%_$(target)
        @echo -e "\n\033[1minstalling $*...\033[0m"
        cd upstream/$*/build-$(target); \
                $(setcc) PATH=$$PATH:`pwd`/../../install/bin \