Module: ppl/ppl Branch: master Commit: d9e719ff0f062c245a79ae8de69d94df473969df URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d9e719ff0f062... Author: Roberto Bagnara <bagnara@cs.unipr.it> Date: Sat Apr 25 09:19:18 2009 +0200 Use the macros OCAMLC, OCAMLOPT and OCAMLDOC instead of hardcoded names. --- doc/Makefile.am | 16 ++++++++-------- interfaces/OCaml/Makefile.am | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index ab02148..3e19707 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1058,7 +1058,7 @@ $(USER_OCAML_INTERFACE_STUFF) -e 's|<PPL_SED_INPUT>|'"$(SED_OCAML_INPUT_USER)"'|' \ $< > Doxyfile.user-ocaml-interface-latex $(TEX_ENV) $(DOXYGEN) Doxyfile.user-ocaml-interface-latex - ocamldoc $(OCAMLDOC_LATEX_OPTIONS) -o $@/ocamldoc.tex \ + $(OCAMLDOC) $(OCAMLDOC_LATEX_OPTIONS) -o $@/ocamldoc.tex \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_globals.mli devref-ocaml-interface.latex-dir: \ @@ -1072,7 +1072,7 @@ $(DEVREF_OCAML_INTERFACE_STUFF) -e 's|<PPL_SED_INPUT>|'"$(SED_OCAML_INPUT_DEVREF)"'|' \ $< > Doxyfile.devref-ocaml-interface-latex $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-ocaml-interface-latex - ocamldoc $(OCAMLDOC_LATEX_OPTIONS) -o $@/ocamldoc.tex \ + $(OCAMLDOC) $(OCAMLDOC_LATEX_OPTIONS) -o $@/ocamldoc.tex \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_globals.mli ppl-user-ocaml-interface-@VERSION@.pdf: user-ocaml-interface.latex-dir @@ -1095,7 +1095,7 @@ $(USER_OCAML_INTERFACE_STUFF) $(USER_CORE_HTML_DIR) (cd $@; $(INSTALLDOX) \ -l $(USER_CORE_HTML_DIR).tag@../$(USER_CORE_HTML_DIR)) mkdir $@/ocamldoc - ocamldoc $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ + $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_globals.mli ppl-devref-ocaml-interface-@VERSION@-html: \ @@ -1112,7 +1112,7 @@ $(DEVREF_OCAML_INTERFACE_STUFF) $(DEVREF_CORE_HTML_DIR) (cd $@; $(INSTALLDOX) \ -l $(DEVREF_CORE_HTML_DIR).tag@../$(DEVREF_CORE_HTML_DIR)) mkdir $@/ocamldoc - ocamldoc $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ + $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_globals.mli # Java Language Interface Targets @@ -1392,7 +1392,7 @@ $(USER_CONFIGURED_OCAML_INTERFACE_STUFF) -e 's|<PPL_SED_INPUT>|'"$(SED_CONFIGURED_OCAML_INPUT_USER)"'|' \ $< > Doxyfile.user-configured-ocaml-interface-latex $(TEX_ENV) $(DOXYGEN) Doxyfile.user-configured-ocaml-interface-latex - ocamldoc $(OCAMLDOC_LATEX_OPTIONS) -o $@/ocamldoc.tex \ + $(OCAMLDOC) $(OCAMLDOC_LATEX_OPTIONS) -o $@/ocamldoc.tex \ ../interfaces/OCaml/ppl_ocaml.mli devref-configured-ocaml-interface.latex-dir: \ @@ -1406,7 +1406,7 @@ $(DEVREF_CONFIGURED_OCAML_INTERFACE_STUFF) -e 's|<PPL_SED_INPUT>|'"$(SED_CONFIGURED_OCAML_INPUT_DEVREF)"'|' \ $< > Doxyfile.devref-configured-ocaml-interface-latex $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-configured-ocaml-interface-latex - ocamldoc $(OCAMLDOC_LATEX_OPTIONS) -o $@/ocamldoc.tex \ + $(OCAMLDOC) $(OCAMLDOC_LATEX_OPTIONS) -o $@/ocamldoc.tex \ ../interfaces/OCaml/ppl_ocaml.mli ppl-user-configured-ocaml-interface-@VERSION@.pdf: \ @@ -1431,7 +1431,7 @@ $(USER_CONFIGURED_OCAML_INTERFACE_STUFF) $(USER_CORE_HTML_DIR) (cd $@; $(INSTALLDOX) \ -l $(USER_CORE_HTML_DIR).tag@../$(USER_CORE_HTML_DIR)) mkdir $@/ocamldoc - ocamldoc $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ + $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ ../interfaces/OCaml/ppl_ocaml.mli ppl-devref-configured-ocaml-interface-@VERSION@-html: \ @@ -1448,7 +1448,7 @@ $(DEVREF_CONFIGURED_OCAML_INTERFACE_STUFF) $(DEVREF_CORE_HTML_DIR) (cd $@; $(INSTALLDOX) \ -l $(DEVREF_CORE_HTML_DIR).tag@../$(DEVREF_CORE_HTML_DIR)) mkdir $@/ocamldoc - ocamldoc $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ + $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ ../interfaces/OCaml/ppl_ocaml.mli endif BUILD_OCAML_INTERFACE diff --git a/interfaces/OCaml/Makefile.am b/interfaces/OCaml/Makefile.am index fb1cfa8..8237afa 100644 --- a/interfaces/OCaml/Makefile.am +++ b/interfaces/OCaml/Makefile.am @@ -193,7 +193,7 @@ $(top_builddir)/interfaces/ppl_interface_instantiations.m4 \ $(interface_generator_files) ppl_ocaml.cma: ppl_ocaml_globals.cmo ppl_ocaml.cmo libppl_ocaml.a - $(OCAMLC_ENV) ocamlc -o $@ -a -custom \ + $(OCAMLC_ENV) $(OCAMLC) -o $@ -a -custom \ ppl_ocaml_globals.cmo ppl_ocaml.cmo \ $(OCAMLC_COMPILE_FLAGS) -cclib -lppl_ocaml \ $(OCAMLC_LINK_FLAGS) @@ -201,7 +201,7 @@ ppl_ocaml.cma: ppl_ocaml_globals.cmo ppl_ocaml.cmo libppl_ocaml.a ppl_ocaml.cmxa: \ ppl_ocaml_globals.cmx ppl_ocaml_globals.o \ ppl_ocaml.cmx ppl_ocaml.o libppl_ocaml.a - $(OCAMLOPT_ENV) ocamlopt -o $@ -a \ + $(OCAMLOPT_ENV) $(OCAMLOPT) -o $@ -a \ ppl_ocaml_globals.cmx ppl_ocaml.cmx \ $(OCAMLOPT_COMPILE_FLAGS) -cclib -lppl_ocaml \ $(OCAMLOPT_LINK_FLAGS) @@ -213,10 +213,10 @@ ppl_ocaml.a: ppl_ocaml.cmxa fi ppl_ocaml.cmo: ppl_ocaml.ml ppl_ocaml.cmi ppl_ocaml_globals.cmi - $(OCAMLC_ENV) ocamlc -o $@ -c $(OCAMLC_COMPILE_FLAGS) ppl_ocaml.ml + $(OCAMLC_ENV) $(OCAMLC) -o $@ -c $(OCAMLC_COMPILE_FLAGS) ppl_ocaml.ml ppl_ocaml.cmx: ppl_ocaml.ml ppl_ocaml.cmi ppl_ocaml_globals.cmi - $(OCAMLOPT_ENV) ocamlopt -o $@ -c $(OCAMLOPT_COMPILE_FLAGS) \ + $(OCAMLOPT_ENV) $(OCAMLOPT) -o $@ -c $(OCAMLOPT_COMPILE_FLAGS) \ ppl_ocaml.ml ppl_ocaml.o: ppl_ocaml.cmx @@ -226,15 +226,15 @@ ppl_ocaml.o: ppl_ocaml.cmx fi ppl_ocaml.cmi: ppl_ocaml.mli - $(OCAMLC_ENV) ocamlc -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< + $(OCAMLC_ENV) $(OCAMLC) -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< ppl_ocaml_globals.cmo: ppl_ocaml_globals.ml ppl_ocaml_globals.cmi - $(OCAMLC_ENV) ocamlc -o $@ -c $(OCAMLC_COMPILE_FLAGS) \ + $(OCAMLC_ENV) $(OCAMLC) -o $@ -c $(OCAMLC_COMPILE_FLAGS) \ $(srcdir)/ppl_ocaml_globals.ml ppl_ocaml_globals.cmx: \ ppl_ocaml_globals.ml ppl_ocaml_globals.cmi - $(OCAMLOPT_ENV) ocamlopt -o $@ -c $(OCAMLOPT_COMPILE_FLAGS) \ + $(OCAMLOPT_ENV) $(OCAMLOPT) -o $@ -c $(OCAMLOPT_COMPILE_FLAGS) \ $(srcdir)/ppl_ocaml_globals.ml ppl_ocaml_globals.o: ppl_ocaml_globals.cmx @@ -244,7 +244,7 @@ ppl_ocaml_globals.o: ppl_ocaml_globals.cmx fi ppl_ocaml_globals.cmi: ppl_ocaml_globals.mli - $(OCAMLC_ENV) ocamlc -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< + $(OCAMLC_ENV) $(OCAMLC) -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< ppl_ocaml.ml: $(interface_generator_dependencies) $(M4) --prefix-builtin -I.. -I$(srcdir) -I$(srcdir)/.. \