X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=3b8b7ecaca67dbd1a1cf01db357f53695a949f7a;hb=33f5fb5c6cb75f813cbe5e64f7b8be5c00d600fd;hp=52776e0ddc81d779a869530184a2aeeff9f45c5e;hpb=9b1c8e53eaa6fb79ee801e3014793618b977857d;p=ocaml-libvirt.git

diff --git a/Makefile.in b/Makefile.in
index 52776e0..3b8b7ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,9 +25,9 @@ MAKENSIS	= @MAKENSIS@
 OCAMLDOC        = @OCAMLDOC@
 OCAMLDOCFLAGS	:= -html -sort
 
-SUBDIRS		= @subdirs@
+SUBDIRS		= libvirt examples
 
-all opt depend install:
+all opt depend install-opt install-byte:
 	for d in $(SUBDIRS); do \
 	  $(MAKE) -C $$d $@; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
@@ -39,10 +39,8 @@ clean:
 	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 examples/get_cpu_stats
+	rm -f examples/domain_events
 
 distclean: clean
 	rm -f config.h config.log config.status configure
@@ -50,12 +48,9 @@ distclean: clean
 	rm -f META
 	rm -f libvirt/libvirt_version.ml
 	rm -f Makefile
+	rm -f Make.rules
 	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).
 
@@ -92,7 +87,7 @@ configure: force
 
 # Distribution.
 
-dist:
+dist: ChangeLog
 	$(MAKE) check-manifest
 	rm -rf $(PACKAGE)-$(VERSION)
 	mkdir $(PACKAGE)-$(VERSION)
@@ -103,12 +98,16 @@ dist:
 	ls -l $(PACKAGE)-$(VERSION).tar.gz
 
 check-manifest:
-	hg manifest | sort > .check-manifest; \
+	git ls-files | sort > .check-manifest; \
 	sort MANIFEST > .orig-manifest; \
 	diff -u .orig-manifest .check-manifest; rv=$$?; \
 	rm -f .orig-manifest .check-manifest; \
 	exit $$rv
 
+ChangeLog:
+	hg log --style changelog > $@.new
+	mv $@.new $@
+
 # Do a release (update the website).
 
 release: configure
@@ -124,8 +123,6 @@ release_stage_3:
 	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.
 
@@ -147,4 +144,4 @@ winupload:
 force:
 
 .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
+	release release_stage_2 release_stage_3 force