checkpoint

[sbp.git] / Makefile

diff --git a/Makefile b/Makefile
index 8cf95ac..8b46585 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,12 @@ java = java
 tibdoc: edu.berkeley.sbp.jar
        $(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
                tests/tibdoc.g \
-               tests/input.tibdoc
+               tests/tib.in
 
 demo: edu.berkeley.sbp.jar
        $(java) -cp $< edu.berkeley.sbp.misc.Demo \
-               tests/demo.g \
-               tests/demo.in
+               tests/meta.g \
+               tests/meta.g
 
 regress:
        make boot
@@ -73,6 +73,13 @@ boot: edu.berkeley.sbp.jar
                ../tests/meta.g \
                edu.berkeley.sbp.misc.MetaGrammarTree
 
+newboot: edu.berkeley.sbp.jar
+       cd src; \
+       $(java) -cp ../$< \
+               edu.berkeley.sbp.misc.Demo \
+               ../tests/meta.g \
+               edu.berkeley.sbp.misc.DemoMetaGrammarTree
+
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)
        mkdir -p bin
        javac -cp javax.servlet.jar:tests/ArchSimA3.jar:tests/grappa.jar -d bin -sourcepath src $^