From 54b9cdaa6686eb28a0cad0ac3f1648f115d3fac5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kim=20Nguy=E1=BB=85n?= Date: Fri, 21 Dec 2012 11:31:06 +0100 Subject: [PATCH] Use ocamlfind to invoke pa_macro appropriately. --- myocamlbuild.ml | 10 ++++------ myocamlbuild_config.ml | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 7a792d1..3410d1b 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -31,7 +31,7 @@ let ( =:: ) r e = r := e :: !r (* Pre-processed files *) let pp_macro_options = ref - [ A "-parser"; A "macro"; A dwsize; A "-I"; P include_path ] + [ A dwsize; A "-I"; P include_path ] let include_full_path = Pathname.pwd / include_path module Depends = @@ -93,7 +93,7 @@ let cxx_compile env _build = (* Native compile and link action *) -let ocamlfind x = S[ T (Tags.singleton "ocamlfind"); A"ocamlfind"; x ; A "-package"; A ocamlfind_packages ] +let ocamlfind x = S[ T (Tags.singleton "ocamlfind"); A"ocamlfind"; x ; A "-package"; A ocamlfind_packages; A "-syntax"; A "camlp4o" ] let ppopt l = List.map (fun e -> S[ A"-ppopt"; e ]) l @@ -143,9 +143,7 @@ let () = dispatch begin | After_rules -> dep [ "link" ] cstub_lib; rule "c++: cpp & depends -> o" ~prod:"%.o" ~deps:[ "%.cpp" ] cxx_compile; - let syntax_flags = S ([ A "-syntax"; A "camlp4o"; - S (ppopt [A "-printer" ; A"Camlp4OCamlAstDumper"]); - S (ppopt !pp_macro_options) ]) + let syntax_flags = S[ S (ppopt !pp_macro_options) ] in flag [ "ocaml"; "ocamldep"] syntax_flags; flag [ "ocaml"; "compile" ] (S[ A "-cc"; A cxx_cmd; S cxx_flags_for_ml ; syntax_flags; S !compile_flags ]); @@ -155,6 +153,6 @@ let () = dispatch begin Quote (S [ _S cstub_lib; S !cxx_link_flags]) ]); flag [ "ocaml"; "byte"; "link" ] (_S !byte_link_flags); flag [ "ocaml"; "native"; "link" ] (_S !native_link_flags); - flag [ "c"; "ocamlmklib"] (S[ A "-custom"; ]) + flag [ "c"; "ocamlmklib"] (A "-custom") | _ -> () end diff --git a/myocamlbuild_config.ml b/myocamlbuild_config.ml index fef4759..7ef1631 100644 --- a/myocamlbuild_config.ml +++ b/myocamlbuild_config.ml @@ -2,7 +2,7 @@ let ocaml_inline = "1000";; let include_path = "include";; let src_path = "src";; let ocaml_link = [ ];; -let ocamlfind_packages = "unix,ulex,expat,camlp4,camlp4.lib";; +let ocamlfind_packages = "unix,ulex,expat,camlp4,camlp4.lib,camlp4.macro";; let cxx_flags = [ "-fno-PIC"; "-std=c++0x"; "-O3" ];; let main_targets = [ "native","src/main.native"; "byte", "src/main.byte" ];; -- 2.17.1