X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=Makefile.in;h=a7cc00b9c8baff6ca7f4d507bd5f77d9857ab8c9;hp=9810b0bc6f636095b989882fc83e56241bae3c6f;hb=7ae8ab4cf04a8d0705115af44fa7364ebc01b167;hpb=9bb5f67c0d8a6e8dad7de72e2488ee73c90f7d43

diff --git a/Makefile.in b/Makefile.in
old mode 100644
new mode 100755
index 9810b0b..a7cc00b
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,25 +20,12 @@ VERSION		= @PACKAGE_VERSION@
 
 INSTALL		= @INSTALL@
 
-pkg_lablgtk2	= @pkg_lablgtk2@
-pkg_curses	= @pkg_curses@
-pkg_xml_light	= @pkg_xml_light@
+MAKENSIS	= @MAKENSIS@
 
+OCAMLDOC        = @OCAMLDOC@
 OCAMLDOCFLAGS	:= -html -sort
 
-SUBDIRS		:= libvirt examples mlvirsh
-
-ifeq ($(pkg_lablgtk2),yes)
-SUBDIRS		+= mlvirtmanager
-endif
-
-ifeq ($(pkg_curses),yes)
-SUBDIRS		+= virt-top
-endif
-
-ifeq ($(pkg_xml_light),yes)
-SUBDIRS		+= virt-df
-endif
+SUBDIRS		= @subdirs@
 
 all opt depend install:
 	for d in $(SUBDIRS); do \
@@ -48,12 +35,13 @@ all opt depend install:
 
 clean:
 	for d in . $(SUBDIRS); do \
-	  (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *.opt *~ core); \
+	  (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *.opt *~ *.dll core); \
 	done
 	rm -f examples/list_domains
 	rm -f mlvirsh/mlvirsh
 	rm -f mlvirtmanager/mlvirtmanager
 	rm -f virt-top/virt-top
+	rm -f virt-df/virt-df
 
 distclean: clean
 	rm -f config.h config.log config.status configure
@@ -70,12 +58,26 @@ distclean: clean
 
 # Developer documentation (in html/ subdirectory).
 
+ifneq ($(OCAMLDOC),)
 doc:
 	rm -rf html
 	mkdir html
 	-cd libvirt; \
-	ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d ../html \
+	$(OCAMLDOC) $(OCAMLDOCFLAGS) -d ../html \
 	  libvirt.{ml,mli} libvirt_version.{ml,mli}
+endif
+
+# Windows installer (requires NSIS).
+
+ifneq ($(MAKENSIS),)
+wininstaller: $(PACKAGE)-$(VERSION).exe
+
+$(PACKAGE)-$(VERSION).exe: wininstaller.nsis all # opt
+	"$(MAKENSIS)" \
+	  //DPACKAGE=$(PACKAGE) //DVERSION=$(VERSION) \
+	  //DOUTFILE=$@ $<
+	ls -l $@
+endif
 
 # Update configure and rerun.
 
@@ -112,16 +114,27 @@ release: configure
 release_stage_2: clean all opt doc dist
 	$(MAKE) release_stage_3
 
-WEBSITE	= ../redhat/et-website
+WEBSITE	= ../redhat/websites
 
 release_stage_3:
 	rm -f $(WEBSITE)/ocaml-libvirt/html/*.{html,css}
 	cp html/*.{html,css} $(WEBSITE)/ocaml-libvirt/html/
-	cp $(PACKAGE)-$(VERSION).tar.gz $(WEBSITE)/ocaml-libvirt/
 	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
+#	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/
 
 force: