2003/09/26 03:24:43

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 86fd40e..fc791a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,10 @@
 
 #
 
-all:      JVM Darwin Linux Win32 Solaris
+all:      JVM Linux Win32 Darwin Solaris
 
 JVM:        build/JVM/xwt.jar
-Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext --static"
+Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext"
 Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
 Win32:    ; make gcj platform=Win32   target=i686-pc-mingw32      link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
 Darwin:   ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)"
@@ -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)/org/xwt/plat/$(platform).cc.o build/$(platform)/builtin.o $(plat_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)
        @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 
+$(target_bin): build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a 
        @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 $(link_flags) $^ 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 $^ build/$(platform)/org/xwt/plat/$(platform).java.o $(link_flags)
 
 
 ##############################################################################
@@ -259,11 +259,11 @@ dist-private:
        make $(silent) update-build
 
        # preserve gcc across builds so we don't have to remake it
-       mkdir -p $(HOME)/dist.xwt.org-gcc
-       mv gcc gcc-
-       ln -s $(HOME)/dist.xwt.org-gcc gcc
-       mv -f gcc-/Makefile gcc/
-       mv -f gcc-/*.patch gcc/
+#      mkdir -p $(HOME)/dist.xwt.org-gcc
+#      mv gcc gcc-
+#      ln -s $(HOME)/dist.xwt.org-gcc gcc
+#      mv -f gcc-/Makefile gcc/
+#      mv -f gcc-/*.patch gcc/
 
        # build it
        nice -n 19 make all
@@ -272,13 +272,23 @@ dist-private:
        echo === master.dist.xwt.org ==================================
 
        echo "copying xwt.jar to distribution area..."
-       cp xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
+       cp build/JVM/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
 
        echo "stripping xwt.exe and copying it to the distribution area..."
-       $(strip) build/Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
+       upstream/install/i686-pc-mingw32/bin/strip build/Win32/xwt.exe \
+               -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
 
        echo "copying xwt.linux to distribution area..."
-       $(strip) build/Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+       upstream/install/i686-pc-linux-gnu/bin/strip build/Linux/xwt.linux \
+               -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+
+       echo "copying xwt.solaris to distribution area..."
+       upstream/install/sparc-sun-solaris2.7/bin/strip build/Solaris/xwt.solaris \
+               -o /var/www/master.dist.xwt.org/xwt-$(current_build).solaris.unsigned
+
+       echo "copying xwt.darwin to distribution area..."
+       upstream/install/powerpc-apple-darwin/bin/strip build/Darwin/xwt.darwin \
+               -o /var/www/master.dist.xwt.org/xwt-$(current_build).darwin.unsigned
 
        echo "creating source tarball in distribution area..."
        CVSROOT=/cvs cvs export -r xwt-$(current_build) xwt