Better error messages in parser

[fireball-separation.git] / ocaml / Makefile

diff --git a/ocaml/Makefile b/ocaml/Makefile
index 3310c6e6e827a3511fb647d35743c195e6cf5ac6..138cc993df503965ecc571ceb1d9f8e177c0707b 100644 (file)
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -1,23 +1,17 @@
 OCAMLC = ocamlopt -g -rectypes
 LIB = unix.cmxa str.cmxa
-UTILS = parser.cmx console.cmx listx.cmx util.cmx pure.cmx num.cmx
+UTILS = util.cmx console.cmx listx.cmx pure.cmx num.cmx parser.cmx
 
-all: a.out test.out test34.out
+all: a.out test4.out
 
-a.out: $(UTILS) lambda3.cmx lambda4.cmx problems.cmx
-       $(OCAMLC) -o a.out $(LIB) $^
-
-test.out: $(UTILS) lambda3.cmx test1.ml
-       $(OCAMLC) -o test.out $(LIB) $^
+run: test4.out
+       bash run
 
-test34.out: $(UTILS) lambda3.cmx lambda4.cmx test.ml
-       $(OCAMLC) -o test34.out $(LIB) $^
-
-andrea.out: $(UTILS) a.out andrea6.ml
-       $(OCAMLC) -o andrea.out $(LIB) $(UTILS) andrea6.ml
+a.out: $(UTILS) lambda4.cmx problems.cmx
+       $(OCAMLC) -o a.out $(LIB) $^
 
-#test2.out: $(UTILS) lambda3.ml test2.ml andrea
-#      ocamlc -o test2.out $(LIB) $(UTILS) lambda3.ml andrea4.ml test2.ml
+test4.out: $(UTILS) lambda4.cmx test.ml
+       $(OCAMLC) -o test4.out $(LIB) $^
 
 %.cmi: %.mli
        $(OCAMLC) -c $<
@@ -26,11 +20,11 @@ andrea.out: $(UTILS) a.out andrea6.ml
        $(OCAMLC) -c $<
 
 clean:
-       rm -f *.cm* *.out .depend log
+       rm -f *.cm* *.out *.o .depend log
 
 .depend: *.ml *.mli
        ocamldep *.ml *.mli > .depend
 
 include .depend
 
-.PHONY: clean all
+.PHONY: clean all run