diff options
| author | pboutill | 2012-06-12 13:10:24 +0000 |
|---|---|---|
| committer | pboutill | 2012-06-12 13:10:24 +0000 |
| commit | 9795bb93ad589b712ff8aee7d68463c5fe3ff9b5 (patch) | |
| tree | f68765b44e2fc12fad56fad1ee3c27401d2129cd | |
| parent | 06420628551c88520ad344cf9441d964d02260dc (diff) | |
New step in purpose to get both camlp4 and camlp5 compatible coq_makefiles
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15435 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | tools/coq_makefile.ml | 17 | ||||
| -rw-r--r-- | toplevel/usage.ml | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index 9d796f95c0..d7e34e059c 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -363,10 +363,9 @@ let variables is_install opt (args,defs) = (* Caml executables and relative variables *) if !some_ml4file || !some_mlfile || !some_mlifile then begin print "COQSRCLIBS?=-I $(COQLIB)kernel -I $(COQLIB)lib \\ - -I $(COQLIB)library -I $(COQLIB)parsing \\ - -I $(COQLIB)pretyping -I $(COQLIB)interp \\ - -I $(COQLIB)printing -I $(COQLIB)intf \\ - -I $(COQLIB)proofs -I $(COQLIB)tactics \\ + -I $(COQLIB)library -I $(COQLIB)parsing -I $(COQLIB)pretyping \\ + -I $(COQLIB)interp -I $(COQLIB)printing -I $(COQLIB)intf \\ + -I $(COQLIB)proofs -I $(COQLIB)tactics -I $(COQLIB)tools \\ -I $(COQLIB)toplevel -I $(COQLIB)grammar"; List.iter (fun c -> print " \\ -I $(COQLIB)plugins/"; print c) Coq_config.plugins_dirs; print "\n"; @@ -376,9 +375,13 @@ let variables is_install opt (args,defs) = print "CAMLLINK?=$(OCAMLC) -rectypes\n"; print "CAMLOPTLINK?=$(OCAMLOPT) -rectypes\n"; print "GRAMMARS?=grammar.cma\n"; - print "CAMLP4EXTEND?=pa_extend.cmo pa_macro.cmo q_MLast.cmo\n"; - print "CAMLP4OPTIONS?=-loc loc\n"; - print "PP?=-pp \"$(CAMLP4BIN)$(CAMLP4)o -I $(CAMLLIB) -I . $(COQSRCLIBS) $(CAMLP4EXTEND) $(GRAMMARS) $(CAMLP4OPTIONS) -impl\"\n\n"; + print "ifeq ($(CAMLP4),camlp5) +CAMLP4EXTEND=pa_extend.cmo q_MLast.cmo pa_macro.cmo +else +CAMLP4EXTEND= +endif\n"; + print "PP?=-pp \"$(CAMLP4BIN)$(CAMLP4O) -I $(CAMLLIB) -I . $(COQSRCLIBS) compat5.cmo \\ + $(CAMLP4EXTEND) $(GRAMMARS) $(CAMLP4OPTIONS) -impl\"\n\n"; end; match is_install with | Project_file.NoInstall -> () diff --git a/toplevel/usage.ml b/toplevel/usage.ml index b4add69ae5..dcf11354b4 100644 --- a/toplevel/usage.ml +++ b/toplevel/usage.ml @@ -99,6 +99,8 @@ let print_config () = Printf.printf "CAMLBIN=%s/\n" (Envars.camlbin ()); Printf.printf "CAMLLIB=%s/\n" (Envars.camllib ()); Printf.printf "CAMLP4=%s\n" Coq_config.camlp4; + Printf.printf "CAMLP4O=%s\n" Coq_config.camlp4o; Printf.printf "CAMLP4BIN=%s/\n" (Envars.camlp4bin ()); Printf.printf "CAMLP4LIB=%s\n" (Envars.camlp4lib ()); + Printf.printf "CAMLP4OPTIONS=%s\n" Coq_config.camlp4compat; Printf.printf "HASNATDYNLINK=%s\n" (if Coq_config.has_natdynlink then "true" else "false") |