Fix parsing error with ~ versus -

[virt-df.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 1eda991..d21bce8 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
@@ -21,7 +22,8 @@ VERSION               = @PACKAGE_VERSION@
 INSTALL                = @INSTALL@
 
 OCAMLDOC        = @OCAMLDOC@
-OCAMLDOCFLAGS  := -html -sort
+OCAMLDOCFLAGS  += -html -sort -package bitstring -I lib
+OCAMLDOCFILES  := $(wildcard lib/diskimage*.mli) lib/int63.mli
 
 SUBDIRS                = lib virt-df diskzip
 
@@ -34,9 +36,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,21 +47,9 @@ 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 \
-         int63.mli diskimage.mli diskimage.ml
-endif
-
 # Distribution.
 
-dist:
+dist: ChangeLog
        $(MAKE) check-manifest
        rm -rf $(PACKAGE)-$(VERSION)
        mkdir $(PACKAGE)-$(VERSION)
@@ -75,5 +66,19 @@ check-manifest:
        rm -f .orig-manifest .check-manifest; \
        exit $$rv
 
-.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
+ChangeLog:
+       hg log --style changelog > $@.new
+       mv $@.new $@
+
+# 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