X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=6d7a77191f458885e90bfce513f75115cefa060a;hp=d87a72c47f4b7cd7a0bcc9d2d63b909d8e09dd84;hb=3971c8cafb25854247125cb1604879f5cf4b8b37;hpb=5f9b5f0992c13f83ed4204f8f49335501f21fb14

diff --git a/Makefile b/Makefile
index d87a72c..6d7a771 100644
--- a/Makefile
+++ b/Makefile
@@ -103,11 +103,11 @@ build/mips2java$(EXE_EXT): $(java_sources) $(java_gen_sources)
 #
 # MIPS Binary compilation
 #
-build/%.o: src/%.c $(tasks)/full_toolchain
+build/%.o: src/%.c $(tasks)/build_gcc
 	@mkdir -p `dirname $@`
 	$(MIPS_CC) $(MIPS_CFLAGS) $($(notdir $*)_CFLAGS) -c -o $@ $<
 
-build/%.o: src/%.s $(tasks)/full_toolchain
+build/%.o: src/%.s $(tasks)/build_gcc
 	@mkdir -p `dirname $@`
 	$(MIPS_CC) -x assembler-with-cpp -c -o $@ $<
 
@@ -174,8 +174,11 @@ env.sh: Makefile $(tasks)/full_toolchain build/org/ibex/nestedvm/Compiler.class
 runtime_classes = Runtime Registers UsermodeConstants util/Seekable
 
 runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class)
-	cd build && jar cf ../$@ $(runtime_classes:%=org/ibex/nestedvm/%*.class)
-
+	cd build && jar cf ../$@ \
+		$(runtime_classes:%=org/ibex/nestedvm/%.class) \
+		org/ibex/nestedvm/Runtime\$$*.class \
+		org/ibex/nestedvm/util/Seekable\$$*.class
+		
 .manifest:
 	echo -ne "Manifest-Version: 1.0\nMain-Class: org.ibex.nestedvm.RuntimeCompiler\n" > $@