X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=6ae85e8e000fb9fc28722e08d4ce683ec718f5a6;hb=140f27408935f7b8b8a8bc2d26e9b355af4b9385;hp=7bb2d1c96d0eef572283ad7a2e9074335581aa9a;hpb=23a55b7225551df68a3e37c46b35b4b89f9457e9;p=goals.git

diff --git a/Makefile.in b/Makefile.in
index 7bb2d1c..6ae85e8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,15 +18,15 @@
 
 # Pass through normal targets to Goalfile.in
 
-# XXX Why can't this parse "all" instead of "all ()"?
-all clean install: src/goals
-	./run src/goals "$@ ()"
+all clean depend install check maintainer-clean dist: src/goals
+	@./run src/goals $@
 
 # If src/goals doesn't exist then brute-force build it.  Once we have
 # src/goals we can rebuild it and other parts of the project using
 # goals itself (see Goalfile.in).
 
 MENHIR = @MENHIR@
+OCAMLDEP = @OCAMLDEP@
 OCAMLFIND = @OCAMLFIND@
 OCAMLLEX = @OCAMLLEX@
 OCAMLFLAGS = @OCAMLFLAGS@
@@ -34,18 +34,13 @@ OCAMLPACKAGES = @OCAMLPACKAGES@
 
 src/goals:
 	$(MENHIR) --explain src/parser.mly
-# Hack required to get includes working.
-	echo 'val lexer_read : (Lexing.lexbuf -> token) option ref' \
-	    >> src/parser.mli
+# Hack required to break circular dependencies.
+	echo 'val lexer_read : (Lexing.lexbuf -> token) option ref' >> src/parser.mli
+	echo 'val eval_substitute : (Ast.env -> Ast.loc -> Ast.substs -> string) option ref' >> src/parser.mli
 	$(OCAMLLEX) src/lexer.mll
-	$(OCAMLFIND) opt $(OCAMLFLAGS) $(OCAMLPACKAGES) -I src \
-	    src/config.mli src/utils.mli src/cmdline.mli src/ast.mli \
-	    src/eval.mli src/run.mli src/parser.mli src/lexer.mli \
-	    src/parse.mli \
-	    src/config.ml src/utils.ml src/cmdline.ml src/ast.ml \
-	    src/eval.ml src/run.ml src/parser.ml src/lexer.ml \
-	    src/parse.ml \
-	    src/main.ml \
+	$(OCAMLFIND) opt $(OCAMLFLAGS) $(OCAMLPACKAGES) -I . -I src \
+	    src/utils-c.c \
+	    $$($(OCAMLDEP) -sort src/*.mli src/*.ml) \
 	    -linkpkg -o $@
 
 # These rules are required by autoconf.