X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=d21bce8dc23116a9eebe237652a37cccaa23aeee;hb=e5c38f2287f2232b0377888341e3cf29a3417252;hp=52776e0ddc81d779a869530184a2aeeff9f45c5e;hpb=49ec200e1391ff462fce459f1c9159a53883badf;p=virt-df.git

diff --git a/Makefile.in b/Makefile.in
index 52776e0..d21bce8 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,11 @@ VERSION		= @PACKAGE_VERSION@
 
 INSTALL		= @INSTALL@
 
-MAKENSIS	= @MAKENSIS@
-
 OCAMLDOC        = @OCAMLDOC@
-OCAMLDOCFLAGS	:= -html -sort
+OCAMLDOCFLAGS	+= -html -sort -package bitstring -I lib
+OCAMLDOCFILES	:= $(wildcard lib/diskimage*.mli) lib/int63.mli
 
-SUBDIRS		= @subdirs@
+SUBDIRS		= lib virt-df diskzip
 
 all opt depend install:
 	for d in $(SUBDIRS); do \
@@ -35,64 +35,21 @@ 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); \
+	  (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a \
+	    *.so *.opt *~ *.dll *.exe *.annot core); \
 	done
-	rm -f examples/list_domains
-	rm -f examples/node_info
-	rm -f mlvirsh/mlvirsh
-	rm -f virt-ctrl/virt-ctrl
-	rm -f virt-top/virt-top
 	rm -f virt-df/virt-df
+	rm -f diskzip/diskzip
 
 distclean: clean
 	rm -f config.h config.log config.status configure
 	rm -rf autom4te.cache
-	rm -f META
-	rm -f libvirt/libvirt_version.ml
 	rm -f Makefile
-	rm -f libvirt/Makefile
-	rm -f examples/Makefile
-	rm -f mlvirsh/Makefile
-	rm -f virt-ctrl/Makefile
-	rm -f virt-top/Makefile
 	rm -f virt-df/Makefile
 
-# Developer documentation (in html/ subdirectory).
-
-ifneq ($(OCAMLDOC),)
-doc:
-	rm -rf html
-	mkdir html
-	-cd libvirt; \
-	$(OCAMLDOC) $(OCAMLDOCFLAGS) -d ../html \
-	  libvirt.{ml,mli} libvirt_version.{ml,mli}
-endif
-
-# Windows installer (requires NSIS).
-
-WININSTALLER := $(PACKAGE)-$(VERSION).exe
-
-ifneq ($(MAKENSIS),)
-wininstaller: $(WININSTALLER)
-
-$(WININSTALLER): wininstaller.nsis all opt
-	"$(MAKENSIS)" \
-	  //DPACKAGE=$(PACKAGE) //DVERSION=$(VERSION) \
-	  //DOUTFILE=$@ $<
-	ls -l $@
-endif
-
-# Update configure and rerun.
-
-configure: force
-	autoreconf
-	CFLAGS=-g \
-	  ./configure \
-	  --enable-debug=yes --with-libvirt=/home/rjones/local
-
 # Distribution.
 
-dist:
+dist: ChangeLog
 	$(MAKE) check-manifest
 	rm -rf $(PACKAGE)-$(VERSION)
 	mkdir $(PACKAGE)-$(VERSION)
@@ -109,42 +66,19 @@ check-manifest:
 	rm -f .orig-manifest .check-manifest; \
 	exit $$rv
 
-# Do a release (update the website).
-
-release: configure
-	$(MAKE) release_stage_2
-
-release_stage_2: clean all opt doc dist
-	$(MAKE) release_stage_3
-
-WEBSITE	= ../redhat/websites
-
-release_stage_3:
-	rm -f $(WEBSITE)/ocaml-libvirt/html/*.{html,css}
-	cp html/*.{html,css} $(WEBSITE)/ocaml-libvirt/html/
-	cp README $(WEBSITE)/ocaml-libvirt/README.txt
-	cp ChangeLog $(WEBSITE)/ocaml-libvirt/ChangeLog.txt
-#	cp virt-top/virt-top.txt $(WEBSITE)/virt-top/
-#	cp ChangeLog $(WEBSITE)/virt-top/ChangeLog.txt
-
-# Upload to main website.
-
-upload:
-	cd $(WEBSITE)/ocaml-libvirt && \
-	scp ChangeLog.txt index.html README.txt Screenshot*.png \
-	  libvirt.org:/data/www/libvirt.org/ocaml && \
-	scp css/*.css \
-	  libvirt.org:/data/www/libvirt.org/ocaml/css/ && \
-	scp html/*.html html/*.css \
-	  libvirt.org:/data/www/libvirt.org/ocaml/html/
-	scp $(PACKAGE)-$(VERSION).tar.gz libvirt.org:/data/ftp/libvirt/ocaml/
-
-# Upload Windows binary installer to main website.
+ChangeLog:
+	hg log --style changelog > $@.new
+	mv $@.new $@
 
-winupload:
-	scp $(WININSTALLER) libvirt.org:/data/ftp/libvirt/ocaml/
+# Developer documentation (in html/ subdirectory).
 
-force:
+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 configure dist check-manifest \
-	release release_stage_2 release_stage_3 force
\ No newline at end of file
+.PHONY: all opt depend install clean distclean dist check-manifest doc force