2003/08/10 06:50:19

darcs-hash:20040130070419-2ba56-23455f477112ad24c491857cb9ccb4f94ae86a2d.gz

diff --git a/Makefile b/Makefile
index 3928e95..7d051c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,16 +66,16 @@ silent := --silent
 endif
 
 compile: .javac $(java_pp_postproc) bin/org/xwt/builtin.xwar
 endif
 
 compile: .javac $(java_pp_postproc) bin/org/xwt/builtin.xwar

-       echo "compiling      .java -> .class:"
+       echo "compiling          .java -> .class:"

        mkdir -p bin
        $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) $(java_pp_postproc) -d bin/ 2>&1 | \
        mkdir -p bin
        $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) $(java_pp_postproc) -d bin/ 2>&1 | \

-               grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling      .java -> .class: src/_"
+               grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"

 
 bin/org/xwt/util/Preprocessor.class: .javac
        echo "compiling preprocessor"
        mkdir -p bin
        $(shell cat .javac) -classpath lib/libgcj-minimal.jar src/org/xwt/util/Preprocessor.java -d bin/ 2>&1 | \
 
 bin/org/xwt/util/Preprocessor.class: .javac
        echo "compiling preprocessor"
        mkdir -p bin
        $(shell cat .javac) -classpath lib/libgcj-minimal.jar src/org/xwt/util/Preprocessor.java -d bin/ 2>&1 | \

-               grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling      .java -> .class: src/_"
+               grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"

 
 $(java_pp_postproc): bin/%.java: src/%.java.pp bin/org/xwt/util/Preprocessor.class
        @echo "preprocessing   .java.pp -> .java:     $<"
 
 $(java_pp_postproc): bin/%.java: src/%.java.pp bin/org/xwt/util/Preprocessor.class
        @echo "preprocessing   .java.pp -> .java:     $<"

@@ -181,11 +181,11 @@ freetype.mips: gcc/src/.freetype
 gcj: $(gcc_path)/bin/$(target)-gcj compile $(target_bin)
 
 $(target_bin): $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xwt/builtin.o
 gcj: $(gcc_path)/bin/$(target)-gcj compile $(target_bin)
 
 $(target_bin): $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xwt/builtin.o

-       @echo "linking           .o -> $(target_bin)"
+       @echo "linking               .o -> $(target_bin)"

        $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) 
 
 bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
        $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) 
 
 bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar

-       @echo "wrapping       .xwar -> .o:     bin/org/xwt/builtin.o"
+       @echo "wrapping           .xwar -> .o:     bin/org/xwt/builtin.o"

        @(echo "unsigned int builtin_xwar_length = ";\
          (wc -c bin/org/xwt/builtin.xwar | sed "s_bin.*__");\
          echo \;;\
        @(echo "unsigned int builtin_xwar_length = ";\
          (wc -c bin/org/xwt/builtin.xwar | sed "s_bin.*__");\
          echo \;;\

@@ -195,13 +195,13 @@ bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
        $(gcc) -c .builtin.c -o bin-$(platform)/org/xwt/builtin.o
 
 $(java_headers): bin/%.h: bin/%.class
        $(gcc) -c .builtin.c -o bin-$(platform)/org/xwt/builtin.o
 
 $(java_headers): bin/%.h: bin/%.class

-       @echo "extracting    .class -> .h:     $<"
+       @echo "extracting        .class -> .h:     $<"

        cd bin; find `echo $< | sed s/.class$$// | sed s_^bin/__ `*.class |\
                sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
                        xargs $(gcjh) --classpath .
 
 $(java_objects): bin-$(platform)/%.java.o: src/%.java
        cd bin; find `echo $< | sed s/.class$$// | sed s_^bin/__ `*.class |\
                sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
                        xargs $(gcjh) --classpath .
 
 $(java_objects): bin-$(platform)/%.java.o: src/%.java

-       @echo "compiling      .java -> .o:     $<"
+       @echo "compiling          .java -> .o:     $<"

        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
 
        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
 

@@ -214,12 +214,12 @@ src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.pa
        rm -rf src/org/ijg/jpeg-6b
 
 $(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
        rm -rf src/org/ijg/jpeg-6b
 
 $(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h

-       @echo "compiling        .cc -> .o:     $<"
+       @echo "compiling            .cc -> .o:     $<"

        @mkdir -p `dirname $@`
        $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
 
 $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
        @mkdir -p `dirname $@`
        $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
 
 $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h

-       @echo "compiling         .c -> .o:     $<"
+       @echo "compiling             .c -> .o:     $<"

        @mkdir -p `dirname $@`
        $(gcc) -Ibin -c $< -o $@
 
        @mkdir -p `dirname $@`
        $(gcc) -Ibin -c $< -o $@
 

@@ -279,7 +279,7 @@ Carbon:
 
 Java2: compile bin/org/xwt/builtin.xwar
        echo -e "\\n=== Java2 ========================================="
 
 Java2: compile bin/org/xwt/builtin.xwar
        echo -e "\\n=== Java2 ========================================="

-       echo "archiving     .class -> .jar"
+       echo "archiving         .class -> .jar"

        mkdir -p bin-Java2
        echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
        cd bin; $(jar) cvfm ../bin-Java2/xwt.jar .manifest \
        mkdir -p bin-Java2
        echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
        cd bin; $(jar) cvfm ../bin-Java2/xwt.jar .manifest \