X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile.in;h=32ff7b577a7224f0558fcc951f404411595fbff9;hb=17dc1d6e0ec8f194df3dd74a7033303ad9ff739c;hp=d28b9312342809ca02ad82cdee707291b44a8c6f;hpb=70c689283bb2c1ba07704be7562767daf82b4d46;p=goals.git

diff --git a/Goalfile.in b/Goalfile.in
index d28b931..32ff7b5 100644
--- a/Goalfile.in
+++ b/Goalfile.in
@@ -59,13 +59,9 @@ let MENHIR = "@MENHIR@"
 let OCAMLDEP = "@OCAMLDEP@"
 let OCAMLFIND = "@OCAMLFIND@"
 let OCAMLLEX = "@OCAMLLEX@"
-# XXX
-let CFLAGS = [ "-g", "-O2", "-I%OCAMLLIB", "-I." ]
-#let CFLAGS = "@CFLAGS@ -I%OCAMLLIB -I."
-let OCAMLFLAGS = [ "-g", "-safe-string", "-warn-error", "CDEFLMPSUVYZX+52-3" ]
-let OCAMLPACKAGES = [ "-package", "str,unix,threads", "-I", "src", "-thread" ]
-#let OCAMLFLAGS = "@OCAMLFLAGS@"
-#let OCAMLPACKAGES = "@OCAMLPACKAGES@"
+let CFLAGS = join (split ("@CFLAGS@"), ["-I%OCAMLLIB", "-I."])
+let OCAMLFLAGS = split ("@OCAMLFLAGS@")
+let OCAMLPACKAGES = join (split ("@OCAMLPACKAGES@"), ["-I", "src"])
 
 let objects = [
     # These must be in dependency order.