X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=Makefile.in;h=52776e0ddc81d779a869530184a2aeeff9f45c5e;hp=3d3f561819e89c4357268c7ab41ff5de52ad740f;hb=748302caa93af2c412bcd30dad5787a5a24e9af5;hpb=f2bb550da8353a7ab11d487b947ed702aa9a838f

diff --git a/Makefile.in b/Makefile.in
old mode 100755
new mode 100644
index 3d3f561..52776e0
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,11 +35,12 @@ all opt depend install:
 
 clean:
 	for d in . $(SUBDIRS); do \
-	  (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *.opt *~ *.dll core); \
+	  (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *.opt *~ *.dll *.exe core); \
 	done
 	rm -f examples/list_domains
+	rm -f examples/node_info
 	rm -f mlvirsh/mlvirsh
-	rm -f mlvirtmanager/mlvirtmanager
+	rm -f virt-ctrl/virt-ctrl
 	rm -f virt-top/virt-top
 	rm -f virt-df/virt-df
 
@@ -52,7 +53,7 @@ distclean: clean
 	rm -f libvirt/Makefile
 	rm -f examples/Makefile
 	rm -f mlvirsh/Makefile
-	rm -f mlvirtmanager/Makefile
+	rm -f virt-ctrl/Makefile
 	rm -f virt-top/Makefile
 	rm -f virt-df/Makefile
 
@@ -69,13 +70,15 @@ endif
 
 # Windows installer (requires NSIS).
 
+WININSTALLER := $(PACKAGE)-$(VERSION).exe
+
 ifneq ($(MAKENSIS),)
-wininstaller: $(PACKAGE)-$(VERSION).exe
+wininstaller: $(WININSTALLER)
 
-$(PACKAGE)-$(VERSION).exe: wininstaller.nsis all # opt
+$(WININSTALLER): wininstaller.nsis all opt
 	"$(MAKENSIS)" \
 	  //DPACKAGE=$(PACKAGE) //DVERSION=$(VERSION) \
-	  //DOUTFILE=$@ //V2 $<
+	  //DOUTFILE=$@ $<
 	ls -l $@
 endif
 
@@ -136,6 +139,11 @@ upload:
 	  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.
+
+winupload:
+	scp $(WININSTALLER) libvirt.org:/data/ftp/libvirt/ocaml/
+
 force:
 
 .PHONY: all opt depend install clean distclean configure dist check-manifest \