Fix 'make doc'

diff --git a/Make.rules.in b/Make.rules.in
index 484d562..38dc389 100644 (file)
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -23,9 +23,6 @@ OCAMLDEP      = @OCAMLDEP@
 OCAMLC         = @OCAMLC@
 OCAMLOPT       = @OCAMLOPT@
 
-OCAMLDOC        = @OCAMLDOC@
-OCAMLDOCFLAGS  += -html -sort
-
 # Common rules for building OCaml objects.
 
 ifneq ($(OCAMLFIND),)
@@ -67,17 +64,6 @@ ifeq ($(wildcard .depend),.depend)
 include .depend
 endif
 
-# Developer documentation (in html/ subdirectory).
-
-ifneq ($(OCAMLDOC),)
-ifneq ($(OCAMLDOCFILES),)
-doc:
-       rm -rf html
-       mkdir html
-       -$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $(OCAMLDOCFILES)
-endif
-endif
-
 .PHONY: depend dist check-manifest dpkg doc
 
 .SUFFIXES:      .cmo .cmi .cmx .ml .mli .mll .mly

diff --git a/Makefile.in b/Makefile.in
index bd1df89..803b94a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,9 +21,13 @@ VERSION              = @PACKAGE_VERSION@
 
 INSTALL                = @INSTALL@
 
+OCAMLDOC        = @OCAMLDOC@
+OCAMLDOCFLAGS  += -html -sort -package bitmatch.syntax -syntax bitmatch.syntax -I lib
+OCAMLDOCFILES  := $(wildcard lib/*.mli)
+
 SUBDIRS                = lib virt-df diskzip
 
-all opt depend install doc:
+all opt depend install:
        for d in $(SUBDIRS); do \
          $(MAKE) -C $$d $@; \
          if [ $$? -ne 0 ]; then exit 1; fi; \
@@ -66,5 +70,15 @@ ChangeLog:
        hg log --style changelog > $@.new
        mv $@.new $@
 
-.PHONY: all opt depend install clean distclean configure dist check-manifest \
-       release release_stage_2 release_stage_3 force
\ No newline at end of file
+# Developer documentation (in html/ subdirectory).
+
+ifneq ($(OCAMLDOC),)
+ifneq ($(OCAMLDOCFILES),)
+doc:
+       rm -rf html
+       mkdir html
+       -ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html $(OCAMLDOCFILES)
+endif
+endif
+
+.PHONY: all opt depend install clean distclean dist check-manifest doc force

diff --git a/diskzip/Makefile.in b/diskzip/Makefile.in
index 9421ffc..c3632e2 100644 (file)
--- a/diskzip/Makefile.in
+++ b/diskzip/Makefile.in
@@ -48,9 +48,6 @@ OCAMLOPTLIBS  := -linkpkg diskimage.cmxa
 
 OCAMLDEPFLAGS   := $(SYNTAX)
 
-OCAMLDOCFLAGS  := $(SYNTAX) -I +extlib -I +bitmatch -I ../lib
-OCAMLDOCFILES  := diskzip.ml
-
 BYTE_TARGETS   := diskzip
 OPT_TARGETS    := diskzip.opt
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 64c4781..5e54923 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -65,9 +65,6 @@ OCAMLOPTLIBS  := $(OCAMLCLIBS)
 
 OCAMLDEPFLAGS  := $(SYNTAX)
 
-OCAMLDOCFLAGS  += $(SYNTAX) -I +extlib -I +bitmatch
-OCAMLDOCFILES  := int63.mli diskimage.mli
-
 BYTE_TARGETS   := diskimage.cma
 OPT_TARGETS    := diskimage.cmxa
 

diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in
index bd5d55f..ade050d 100644 (file)
--- a/virt-df/Makefile.in
+++ b/virt-df/Makefile.in
@@ -34,10 +34,6 @@ ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES  += -package gettext-stub
 endif
 
-OCAMLDOCFLAGS  := -I +extlib -I +bitmatch -I +libvirt -I +xml-light \
-                 -I +csv -I +gettext -I +gettext-stub -I ../lib
-OCAMLDOCFILES  := $(wildcard *.mli) $(wildcard *.ml)
-
 #----------------------------------------------------------------------
 # Build up the list of object files.