2004/01/13 10:27:45

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 11e25f3..d9677b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,12 +55,13 @@ all_java_sources  := $(java_sources)
 nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(java_sources)) build/java/org/xwt/translators/Freetype.java build/java/org/xwt/translators/MSPack.java build/java/org/xwt/translators/MIPSApps.java 
 plat_java_sources         := $(filter build/java/org/xwt/plat/%, $(java_sources))
 
-build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips build/class/org/xwt/mips/Compiler.class
+build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips
+       make build/class/org/xwt/mips/Compiler.class
        mkdir -p build/java/org/xwt/translators
        @echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
        (echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n'; \
         java -Xint -cp build/class org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips)\
-        > $@
+        | sed 's,//.*$$,,;'|tr -d '\n' > $@
 
 build/java/org/xwt/%.java: src/org/xwt/%.java
        make build/class/org/xwt/util/Preprocessor.class
@@ -332,4 +333,4 @@ dist-private:
 #test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
 test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
 
-oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ src/org/xwt/mips -name \*.java`
+oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java`