From 573246ccc2dda31017fc14ea0e008a312bc6db20 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:37:03 +0000 Subject: [PATCH] 2003/09/26 06:03:22 darcs-hash:20040130073703-2ba56-85cb0d9dca127ebc42d56cf2216f7ee1ccefa5b4.gz --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4c950ee..96bad1c 100644 --- a/Makefile +++ b/Makefile @@ -119,16 +119,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) -build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/builtin.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o) +build/$(platform)/$(platform).ar: $(java_objects) $(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/$(target)/bin/ar rc $@ $? upstream/install/$(target)/bin/ranlib $@ -$(target_bin): build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a +$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) - PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib $^ build/$(platform)/org/xwt/plat/$(platform).java.o $(link_flags) + PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags) ############################################################################## -- 1.7.10.4