Fix native virt-ctrl on Windows.

[virt-top.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9810b0b..53a6829 100644 (file)
--- 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-ctrl/virt-ctrl
        rm -f virt-top/virt-top
+       rm -f virt-df/virt-df
 
 distclean: clean
        rm -f config.h config.log config.status configure
@@ -64,18 +52,32 @@ 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
 
 # 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: