Make the code OCaml-4.06.1-friendly

[fireball-separation.git] / ocaml / Makefile

diff --git a/ocaml/Makefile b/ocaml/Makefile
index 6ff0e021614219c3fe0158d5de9a893aaa415f47..2557224f0f1397e830dfad21f0c753df47078b8d 100644 (file)
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -1,17 +1,23 @@
 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 problems.cmx
 
-all: a.out test.out test34.out
+all: a.out test4.out simple.out simple_test.out
 
-a.out: $(UTILS) lambda3.cmx lambda4.cmx problems.cmx
+run: test4.out
+       bash run
+
+a.out: $(UTILS) lambda4.cmx
        $(OCAMLC) -o a.out $(LIB) $^
 
-test.out: $(UTILS) lambda3.cmx test1.ml
-       $(OCAMLC) -o test.out $(LIB) $^
+test4.out: $(UTILS) lambda4.cmx test.ml
+       $(OCAMLC) -o test4.out $(LIB) $^
+
+simple.out: $(UTILS) simple.cmx
+       $(OCAMLC) -o simple.out $(LIB) $^
 
-test34.out: $(UTILS) lambda3.cmx lambda4.cmx test.ml
-       $(OCAMLC) -o test34.out $(LIB) $^
+simple_test.out: $(UTILS) simple.cmx simple_test.ml
+       $(OCAMLC) -o simple_test.out $(LIB) $^
 
 %.cmi: %.mli
        $(OCAMLC) -c $<
@@ -20,11 +26,11 @@ test34.out: $(UTILS) lambda3.cmx lambda4.cmx test.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