build runtime.jar correctly

darcs-hash:20040510085642-24bed-e58d17b712e7998f661cb296fe31c7cc92d46423.gz

diff --git a/Makefile b/Makefile
index d87a72c..dc424ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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)
 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" > $@
 
 .manifest:
        echo -ne "Manifest-Version: 1.0\nMain-Class: org.ibex.nestedvm.RuntimeCompiler\n" > $@