Module: ppl/ppl Branch: master Commit: 3b959163da9e982568db53698e377a72c1f95da7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3b959163da9e9...

Author: Enea Zaffanella zaffanella@cs.unipr.it Date: Thu Apr 2 18:37:45 2009 +0200

Use @mlgmp_dir@ instead of +gmp for the -I option of ocamldoc.

---

doc/Makefile.am | 4 ++-- interfaces/OCaml/tests/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am index 17ae32d..ac2ab5e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1041,10 +1041,10 @@ $(srcdir)/../interfaces/OCaml/ppl_ocaml_common.inlines.hh \ $(srcdir)/gpl.dox $(srcdir)/fdl.dox

OCAMLDOC_HTML_OPTIONS = \ --I +gmp -I $(top_builddir)/interfaces/OCaml -html +-I @mlgmp_dir@ -I $(top_builddir)/interfaces/OCaml -html

OCAMLDOC_LATEX_OPTIONS = \ --I +gmp -I $(top_builddir)/interfaces/OCaml \ +-I @mlgmp_dir@ -I $(top_builddir)/interfaces/OCaml \ -latex -noheader -notrailer -notoc

user-ocaml-interface.latex-dir: \ diff --git a/interfaces/OCaml/tests/Makefile.am b/interfaces/OCaml/tests/Makefile.am index ca98b4a..78ef7e1 100644 --- a/interfaces/OCaml/tests/Makefile.am +++ b/interfaces/OCaml/tests/Makefile.am @@ -134,7 +134,7 @@ test1_opt_SOURCES = test1.ml test1_opt$(EXEEXT): test1.cmx ../ppl_ocaml.cmxa $(OCAMLOPT_ENV) ocamlopt -o $@ \ -cc "$(CXX)" $(OCAMLOPT_COMPILE_FLAGS) \ - $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLC_LINK_FLAGS) \ + $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLOPT_LINK_FLAGS) \ ppl_ocaml.cmxa $<

@@ -159,7 +159,7 @@ ppl_ocaml_generated_test_opt$(EXEEXT): \ ppl_ocaml_generated_test.cmx ../ppl_ocaml.cmxa $(OCAMLOPT_ENV) ocamlopt -o $@ \ -cc "$(CXX)" $(OCAMLOPT_COMPILE_FLAGS) \ - $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLC_LINK_FLAGS) \ + $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLOPT_LINK_FLAGS) \ ppl_ocaml.cmxa $<

MOSTLYCLEANFILES = \