X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=myocamlbuild.ml;h=3b3e516241494244cd78542b6ab72a2da5584cc3;hb=a718c76f2cf07c28fcf8a272e9ad699889049d3b;hp=2d9913ed76fd456be656e45551f5cbb4da6c495b;hpb=30bc0bb1291426e5e26eb2dee1ffc41e4c246349;p=tatoo.git

diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 2d9913e..3b3e516 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -1,28 +1,16 @@
 open Ocamlbuild_plugin
-open Command
+let includes =
+  let open Pathname in
+  let d = Array.to_list (readdir "include") in
+  List.map (concat "include") d
 
-let ocamlfind_packages = "unix,ulex,expat,camlp4,camlp4.lib,camlp4.macro"
 
-let ocamlfind x = S[ T (Tags.singleton "ocamlfind");
-                     A "ocamlfind"; x ;
-                     A "-package";
-                     A ocamlfind_packages;
-                     A "-syntax";
-                     A "camlp4o";
-                     A "-ppopt"; A "-I"; A"-ppopt"; A"include"
-                   ]
-
-let () = dispatch begin
-  function
-    | Before_rules ->
-      Options.ocamlc := ocamlfind  (A"ocamlc");
-      Options.ocamlopt := ocamlfind (A"ocamlopt");
-      Options.ocamldep := ocamlfind (A"ocamldep");
-      Options.ocamldoc := ocamlfind (A"ocamldoc");
-      Options.ocamlmktop := ocamlfind (A"ocamlmktop");
-      dep [ "extension:ml" ]
-        (List.map (fun s -> "include/" ^ s )
-           (Array.to_list (Pathname.readdir "include")));
-      flag [ "ocaml"; "link" ] (A"-linkpkg")
-    | _ -> ()
-end
+let () =
+  dispatch (function
+             | After_rules ->
+                dep ["ocaml";"compile";] includes;
+                dep ["ocaml";"ocamldep"; ] includes;
+                pflag ["ocaml";"compile";] "ppopt" (fun s -> S [A"-ppopt"; A (s)]);
+                pflag ["ocaml";"ocamldep";] "ppopt" (fun s -> S [A"-ppopt"; A (s)]);
+             | _ -> ()
+           )