X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=bd1df89b79c431b68a362885b306f4a90c552f53;hb=f1009eec3cfb900762f6f978572e5820afeb8bf3;hp=127a260f4a0d5b4d030b2e818f06cb12d92756ec;hpb=0b2bee9a672e5884f17ef231daf12daa89c26126;p=virt-df.git

diff --git a/Makefile.in b/Makefile.in
index 127a260..bd1df89 100644
--- 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,21 +43,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 \
-	  diskimage.mli diskimage.ml
-endif
-
 # Distribution.
 
-dist:
+dist: ChangeLog
 	$(MAKE) check-manifest
 	rm -rf $(PACKAGE)-$(VERSION)
 	mkdir $(PACKAGE)-$(VERSION)
@@ -75,5 +62,9 @@ check-manifest:
 	rm -f .orig-manifest .check-manifest; \
 	exit $$rv
 
+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