X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=d9677b81b396a7e00f38900c7c99bd3f1392f432;hb=02e33b14dc483c8890fa1a6084c684473d94644b;hp=07304a17c9690f4ca90f309b4e21e651ce898b55;hpb=baed1480fbb1d933f73f31a0fcf10b07688aacaf;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 07304a1..d9677b8 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ dist-clean:
 	find upstream -name config.cache -exec rm {} \;
 
 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)"
@@ -49,18 +49,19 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-java_sources      := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/mips/*'))
+java_sources      := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/util/Preprocessor.java'))
 all_java_sources  := $(java_sources)
 
-nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(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
@@ -145,6 +146,7 @@ java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.jav
 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)
+	rm -f $@
 	upstream/install/$(target)/bin/ar rc $@ $?
 	upstream/install/$(target)/bin/ranlib $@
 
@@ -331,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`