summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxence Guesdon <maxence.guesdon@inria.fr>2009-04-09 13:55:53 +0000
committerMaxence Guesdon <maxence.guesdon@inria.fr>2009-04-09 13:55:53 +0000
commit6317d017cda0b1e67665c985f8aa46b126684175 (patch)
tree4b58e1cfc0115d605854938657903ce2c0a773ce
parente1556cf9da4ed560ada54ea77bca03308ab1be8f (diff)
downloadocaml-6317d017cda0b1e67665c985f8aa46b126684175.tar.gz
fix compilatin of ocamldoc for NT with no odoc_opt.ml any more
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9228 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--ocamldoc/Makefile.nt9
1 files changed, 5 insertions, 4 deletions
diff --git a/ocamldoc/Makefile.nt b/ocamldoc/Makefile.nt
index 33ccc4f3a4..11d44b4f7d 100644
--- a/ocamldoc/Makefile.nt
+++ b/ocamldoc/Makefile.nt
@@ -115,6 +115,7 @@ EXECMOFILES=$(CMOFILES)\
odoc_latex.cmo\
odoc_texi.cmo\
odoc_dot.cmo\
+ odoc.cmo
EXECMXFILES= $(EXECMOFILES:.cmo=.cmx)
@@ -186,10 +187,10 @@ libopt: $(OCAMLDOC_LIBCMXA) $(OCAMLDOC_LIBCMI)
debug:
make OCAMLPP=""
-$(OCAMLDOC): $(EXECMOFILES) odoc.cmo
- $(OCAMLC) -o $@ -linkall unix.cma str.cma dynlink.cma $(LINKFLAGS) $(OCAMLCMOFILES) $(EXECMOFILES) odoc.cmo
-$(OCAMLDOC_OPT): $(EXECMXFILES) odoc_opt.cmx
- $(OCAMLOPT) -o $@ unix.cmxa str.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES) odoc_opt.cmx
+$(OCAMLDOC): $(EXECMOFILES)
+ $(OCAMLC) -o $@ -linkall unix.cma str.cma dynlink.cma $(LINKFLAGS) $(OCAMLCMOFILES) $(EXECMOFILES)
+$(OCAMLDOC_OPT): $(EXECMXFILES)
+ $(OCAMLOPT) -o $@ unix.cmxa str.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES)
$(OCAMLDOC_LIBCMA): $(LIBCMOFILES)
$(OCAMLC) -a -o $@ $(LINKFLAGS) $(OCAMLCMOFILES) $(LIBCMOFILES)