From 2699c6477b70204507055b4841335af1ca663d3b Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:35:58 +0000 Subject: [PATCH] 2003/09/20 01:50:54 darcs-hash:20040130073558-2ba56-0299be39c9457b4cf132fc2227b0cc1b4496f48a.gz --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 47cfc3f..9cd4a8b 100644 --- a/Makefile +++ b/Makefile @@ -114,11 +114,16 @@ jpeg_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target) java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o) -$(target_bin): $(java_objects) upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o) +build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o) + @echo -e "\n\033[1marchiving .o -> .a\033[0m" + mkdir -p build/$(platform) + upstream/install/bin/$(target)-ar rc $@ $? + upstream/install/bin/$(target)-ranlib $@ + +$(target_bin): build/$(platform)/$(platform).ar upstream/jpeg-6b/build-$(target)/libjpeg.a @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) - upstream/install/bin/$(target)-ar rcs $(platform).ar $^ - PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags) $(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o + PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib $(link_flags) $^ build/$(platform)/org/xwt/plat/$(platform).java.o ############################################################################## -- 1.7.10.4