X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=57074b0da9edddea12cffc7ee55762311a26afbb;hb=49cb14fa5b1e479ed41c38fd60372d9cd3086cd3;hp=24d675a8fbd7869ce3e6c392a4f1e7ec62851f67;hpb=6ca8e846620f8c46811c8417b6f9b7f05d79a706;p=nestedvm.git

diff --git a/Makefile b/Makefile
index 24d675a..57074b0 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ build/%.class: build/%.java build/org/ibex/nestedvm/Runtime.class
 else
 
 build/%.class: build/%.mips build/org/ibex/nestedvm/ClassFileCompiler.class
-	$(JAVA) -cp "$(classpath)" org.ibex.nestedvm.Compiler -outformat class -outfile $@ $(compiler_flags) $($(notdir $*)_COMPILERFLAGS) $(subst /,.,$*) $<
+	$(JAVA) -cp "$(classpath)" org.ibex.nestedvm.Compiler -outformat class -d build $(compiler_flags) $($(notdir $*)_COMPILERFLAGS) $(subst /,.,$*) $<
 
 
 endif
@@ -218,6 +218,7 @@ runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class)
 
 nestedvm.jar: $(java_classes) .manifest
 	cd build && jar cfm ../$@ ../.manifest $(java_classes:build/%.class=%*.class)
+	cd $(CLASSGEN_PATH) && jar uf $(mips2java_root)/$@ .
 
 compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcclass
 	mkdir -p tmp/pruned
@@ -471,11 +472,13 @@ doc/charts/%.pdf: doc/charts/%.dat doc/charts/%.gnuplot
 
 doc/ivme04.pdf: doc/ivme04.tex doc/acmconf.cls $(charts:%.dat=%.pdf) build/tests/TeX.class
 	cp upstream/build/tex/tex.pool upstream/build/tex/texinputs/tex.pool
-	cd upstream/build/tex/texinputs && echo '\latex.ltx' | java -cp $(build) tests.TeX
+	cd upstream/build/tex/texinputs && echo '\latex.ltx' | java -cp $(mips2java_root)/build:$(mips2java_root)/$(CLASSGEN_PATH) tests.TeX
 	cd upstream/build/tex/texinputs && ln -fs ../../../../doc/* .; rm -f ivme04.aux; touch ivme04.aux; touch ivme04.bbl
-	cd upstream/build/tex/texinputs && echo '\&latex \input ivme04.tex' | java -cp $(build) tests.TeX
+	cd upstream/build/tex/texinputs && echo '\&latex \input ivme04.tex' | java -cp $(mips2java_root)/build:$(mips2java_root)/$(CLASSGEN_PATH) tests.TeX
+	cd upstream/build/tex/texinputs && bibtex ivme04
+	cd upstream/build/tex/texinputs && echo '\&latex \input ivme04.tex' | java -cp $(mips2java_root)/build:$(mips2java_root)/$(CLASSGEN_PATH) tests.TeX
 	cd upstream/build/tex/texinputs && dvipdf ivme04.dvi
-	cp upstream/build/tex/texinputs/ivme04.pdf $@
+	#cp upstream/build/tex/texinputs/ivme04.pdf $@
 
 pdf: doc/ivme04.pdf
 	open doc/ivme04.pdf