2003/11/16 08:28:09

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index a461981..e057fbd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/
 # Special treatment:
 #
 
-builtin_src := $(shell find src/org/xwt/builtin -name '*.*')
+builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf')
 build/res/fonts/vera: .download_vera-1.10
        mkdir -p build/res/fonts/vera
        cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
@@ -193,14 +193,15 @@ build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/
                -Lbuild/mips \
                -Lupstream/freetype-2.1.4/src/objs \
                -o $@ \
-               build/mips/org/xwt/translators/Freetype.c.o \
-               --strip \
+               $^ \
+               -Wl,-s \
                -lfreetype
 
 .install_libmspack-20030726:; make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
-build/res/libmspack.mips: .install_libmspack-20030726 build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
+build/res/libmspack.mips: build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
        @echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
        mkdir -p build/mips build/res
+       make .install_libmspack-20030726 
        upstream/install/bin/mips-unknown-elf-gcc \
                -nostdlib \
                --static \
@@ -210,8 +211,8 @@ build/res/libmspack.mips: .install_libmspack-20030726 build/mips/org/xwt/transla
                -Lupstream/libmspack-20030726/src/mspack \
                -Lupstream/libmspack-20030726/build-mips-unknown-elf \
                -o $@ \
-               build/mips/org/xwt/translators/MSPack.c.o \
-               --strip \
+               $^ \
+               -Wl,-s \
                -lmspack