Reorganize metadata parsing so it happens only once.

[virt-df.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 127a260..caf7775 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,6 @@
-# ocaml-libvirt
-# Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
+# virt-df
+# @configure_input@
+# Copyright (C) 2007-2008 Red Hat Inc., Richard W.M. Jones
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,12 +21,9 @@ VERSION              = @PACKAGE_VERSION@
 
 INSTALL                = @INSTALL@
 
-OCAMLDOC        = @OCAMLDOC@
-OCAMLDOCFLAGS  := -html -sort
-
 SUBDIRS                = lib virt-df diskzip
 
-all opt depend install:
+all opt depend install doc:
        for d in $(SUBDIRS); do \
          $(MAKE) -C $$d $@; \
          if [ $$? -ne 0 ]; then exit 1; fi; \
@@ -34,9 +32,10 @@ all opt depend install:
 clean:
        for d in . $(SUBDIRS); do \
          (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a \
-           *.so *.opt *~ *.dll *.exe core); \
+           *.so *.opt *~ *.dll *.exe *.annot core); \
        done
        rm -f virt-df/virt-df
+       rm -f diskzip/diskzip
 
 distclean: clean
        rm -f config.h config.log config.status configure
@@ -44,18 +43,6 @@ distclean: clean
        rm -f Makefile
        rm -f virt-df/Makefile
 
-# Developer documentation (in html/ subdirectory).
-
-ifneq ($(OCAMLDOC),)
-doc:
-       rm -rf html
-       mkdir html
-       -cd lib; \
-       $(OCAMLDOC) $(OCAMLDOCFLAGS) -d ../html \
-         -I +extlib -I +bitmatch \
-         diskimage.mli diskimage.ml
-endif
-
 # Distribution.
 
 dist: