X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile.in;h=393b4e96b86da5ff7dde3a4530c6ab509377ad5c;hb=a48b05d35f0646322e8178ff10f8ed7af3e739aa;hp=0990d6a1ddccd1c7976a8a4f45888ad2116837f9;hpb=eaa22cca2ae85beff5b6f981e084fc9d9b57f202;p=goals.git

diff --git a/Goalfile.in b/Goalfile.in
index 0990d6a..393b4e9 100644
--- a/Goalfile.in
+++ b/Goalfile.in
@@ -33,17 +33,17 @@ let objects = [
     "src/utils.cmx",
     "src/cmdline.cmx",
     "src/ast.cmx",
-    "src/eval.cmx",
-    "src/run.cmx",
     "src/parser.cmx",
     "src/lexer.cmx",
     "src/parse.cmx",
+    "src/eval.cmx",
+    "src/run.cmx",
     "src/main.cmx"
 ]
 
 let subdirs = [ "m4", "src", "stdlib", "tests" ]
 
-goal all = : ocaml_link ("src/goals", objects)
+goal all = : "Goalfile", ocaml_link ("src/goals", objects)
 
 goal clean = {
     for d in %subdirs; do
@@ -64,31 +64,35 @@ goal maintainer-clean = : clean {
 
 "src/parser.mli", "src/parser.ml" : "src/parser.mly" {
     %MENHIR --explain %<
+    # 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
 }
 
 "src/lexer.ml" : "src/lexer.mll" {
     %OCAMLLEX %<
 }
 
-# XXX Depends on *.ml *.mli, but we don't have a function for this yet.
 # XXX Goalfile itself depends on this and we should probably have a
 # way to reevaluate it.
 # XXX Atomic output.
-"src/.depend" : {
+goal depend () =
+"src/.depend" : wildcard ("src/*.ml"), wildcard ("src/*.mli") {
     rm -f %@ %@-t
     # Like many existing tools, ocamldep produces make-compatible
     # output which doesn't work directly in goals.
-    %OCAMLDEP -all -one-line src/*.ml src/*.mli |
+    %OCAMLDEP -all -one-line -I src %< |
         sed 's|[./[:alnum:]]\+|"&"|g' |
         sed 's|" "|", "|g' |
         sed 's|.*|& ;|' > %@-t
     mv %@-t %@
 }
 
--include "src/.depend"
+-include "src/.depend";
 
-# XXX The Goalfile itself needs rules to rebuild it.
-#Makefile: Makefile.in ../config.status
-#        ../config.status $@
-#config.ml: config.ml.in ../config.status
-#        ../config.status $@
+"Goalfile": "Goalfile.in", "config.status" {
+    ./config.status %@
+}
+"src/config.ml" : "src/config.ml.in", "config.status" {
+    ./config.status %@
+}