checkpoint

[sbp.git] / Makefile

diff --git a/Makefile b/Makefile
index 8b46585..daaf625 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ tibdoc: edu.berkeley.sbp.jar
 
 demo: edu.berkeley.sbp.jar
        $(java) -cp $< edu.berkeley.sbp.misc.Demo \
-               tests/meta.g \
-               tests/meta.g
+               tests/demo.g \
+               '(11+2*3)-44'
 
 regress:
        make boot
@@ -69,16 +69,9 @@ ifthen: edu.berkeley.sbp.jar
 boot: edu.berkeley.sbp.jar
        cd src; \
        $(java) -cp ../$< \
-               edu.berkeley.sbp.misc.MetaGrammar \
-               ../tests/meta.g \
-               edu.berkeley.sbp.misc.MetaGrammarTree
-
-newboot: edu.berkeley.sbp.jar
-       cd src; \
-       $(java) -cp ../$< \
-               edu.berkeley.sbp.misc.Demo \
+               edu.berkeley.sbp.meta.MetaGrammar \
                ../tests/meta.g \
-               edu.berkeley.sbp.misc.DemoMetaGrammarTree
+               edu.berkeley.sbp.meta.MetaGrammarTree
 
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)
        mkdir -p bin