diff options
| author |  notin <notin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2006-08-29 12:36:37 +0000 |
|---|---|---|
| committer | notin <notin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2006-08-29 12:36:37 +0000 |
| commit | 1f7689b7c932950777fdea44f5d3f1d03abef22f (patch) | |
| tree | d2375fd726481d08fe869a9c3526dd57a8cdc4a8 | |
| parent | 813276650f60ef104863b0d2648752aeb1ec204d (diff) | |
Changement de l'appel aux exécutables Caml (noms absolus)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9095 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | Makefile | 25 | ||||
| -rw-r--r-- | config/Makefile.template | 6 | ||||
| -rwxr-xr-x | configure | 10 |
3 files changed, 36 insertions, 5 deletions
@@ -75,7 +75,6 @@ MLINCLUDES=$(LOCALINCLUDES) -I $(MYCAMLP4LIB) BYTEFLAGS=$(MLINCLUDES) $(CAMLDEBUG) $(USERFLAGS) OPTFLAGS=$(MLINCLUDES) $(CAMLTIMEPROF) $(USERFLAGS) -OCAMLDEP=ocamldep DEPFLAGS=$(LOCALINCLUDES) OCAMLC_P4O=$(OCAMLC) -pp $(CAMLP4O) $(BYTEFLAGS) @@ -1322,6 +1321,24 @@ clean:: rm -f doc/coq.tex ########################################################################### +# Documentation of the source code (using ocamldoc) +########################################################################### + +SOURCEDOCDIR=dev/source-doc + +.PHONY: source-doc + +source-doc: + if !(test -d $(SOURCEDOCDIR)); then mkdir $(SOURCEDOCDIR); fi + $(OCAMLDOC) -html -rectypes $(LOCALINCLUDES) -d $(SOURCEDOCDIR) `find . -name "*.ml"` + +clean:: + rm -rf $(SOURCEDOCDIR) + + + + +########################################################################### # Emacs tags ########################################################################### @@ -1580,15 +1597,15 @@ parsing/lexer.cmo: parsing/lexer.ml4 .mll.ml: $(SHOW)'OCAMLLEX $<' - $(HIDE)ocamllex $< + $(HIDE)$(OCAMLLEX) $< .mly.ml: $(SHOW)'OCAMLYACC $<' - $(HIDE)ocamlyacc $< + $(HIDE)$(OCAMLYACC) $< .mly.mli: $(SHOW)'OCAMLYACC $<' - $(HIDE)ocamlyacc $< + $(HIDE)$(OCAMLYACC) $< .ml4.cmx: $(SHOW)'OCAMLOPT4 $<' diff --git a/config/Makefile.template b/config/Makefile.template index d5c2a1436..1907cb0d6 100644 --- a/config/Makefile.template +++ b/config/Makefile.template @@ -51,11 +51,15 @@ MYCAMLP4LIB=CAMLP4LIBDIRECTORY # Objective-Caml compile command OCAMLC=BYTECAMLC OCAMLOPT=NATIVECAMLC +OCAMLDEP=OCAMLDEPEXEC +OCAMLDOC=OCAMLDOCEXEC +OCAMLLEX=OCAMLLEXEXEC +OCAMLYACC=OCAMLYACCEXEC # Caml link command and Caml make top command CAMLLINK=BYTECAMLC CAMLOPTLINK=NATIVECAMLC -CAMLMKTOP=ocamlmktop +CAMLMKTOP=CAMLMKTOPEXEC # Compilation debug flag CAMLDEBUG=COQDEBUGFLAG @@ -213,6 +213,11 @@ fi CAMLBIN=`dirname "$CAMLC"` bytecamlc="$CAMLC" nativecamlc=$CAMLBIN/$nativecamlc +ocamldepexec=$CAMLBIN/ocamldep +ocamldocexec=$CAMLBIN/ocamldoc +ocamllexexec=$CAMLBIN/ocamllex +ocamlyaccexec=$CAMLBIN/ocamlyacc +camlmktopexec=$CAMLBIN/ocamlmktop CAMLVERSION=`"$bytecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` @@ -609,6 +614,11 @@ sed -e "s|LOCALINSTALLATION|$local|" \ -e "s|EXECUTEEXTENSION|$EXE|" \ -e "s|BYTECAMLC|$bytecamlc|" \ -e "s|NATIVECAMLC|$nativecamlc|" \ + -e "s|OCAMLDEPEXEC|$ocamldepexec|" \ + -e "s|OCAMLDOCEXEC|$ocamldocexec|" \ + -e "s|OCAMLLEXEXEC|$ocamllexexec|" \ + -e "s|OCAMLYACCEXEC|$ocamlyaccexec|" \ + -e "s|CAMLMKTOPEXEC|$camlmktopexec|" \ -e "s|STRIPCOMMAND|$STRIPCOMMAND|" \ -e "s|FSETSOPT|$fsets|" \ -e "s|REALSOPT|$reals|" \ |