git.annexia.org
/
virt-top.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move connection dialog to its own module. ocaml-dbus >= 0.04.
[virt-top.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
1db3843
..
52776e0
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-20,25
+20,12
@@
VERSION = @PACKAGE_VERSION@
INSTALL = @INSTALL@
INSTALL = @INSTALL@
-pkg_lablgtk2 = @pkg_lablgtk2@
-pkg_curses = @pkg_curses@
-pkg_xml_light = @pkg_xml_light@
+MAKENSIS = @MAKENSIS@
+OCAMLDOC = @OCAMLDOC@
OCAMLDOCFLAGS := -html -sort
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 \
all opt depend install:
for d in $(SUBDIRS); do \
@@
-48,12
+35,14
@@
all opt depend install:
clean:
for d in . $(SUBDIRS); do \
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 *.exe
core); \
done
rm -f examples/list_domains
done
rm -f examples/list_domains
+ rm -f examples/node_info
rm -f mlvirsh/mlvirsh
rm -f mlvirsh/mlvirsh
- rm -f
mlvirtmanager/mlvirtmanager
+ rm -f
virt-ctrl/virt-ctrl
rm -f virt-top/virt-top
rm -f virt-top/virt-top
+ rm -f virt-df/virt-df
distclean: clean
rm -f config.h config.log config.status configure
distclean: clean
rm -f config.h config.log config.status configure
@@
-64,18
+53,34
@@
distclean: clean
rm -f libvirt/Makefile
rm -f examples/Makefile
rm -f mlvirsh/Makefile
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).
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; \
doc:
rm -rf html
mkdir html
-cd libvirt; \
-
ocamlfind ocamldoc
$(OCAMLDOCFLAGS) -d ../html \
+
$(OCAMLDOC)
$(OCAMLDOCFLAGS) -d ../html \
libvirt.{ml,mli} libvirt_version.{ml,mli}
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.
# Update configure and rerun.
@@
-134,6
+139,11
@@
upload:
libvirt.org:/data/www/libvirt.org/ocaml/html/
scp $(PACKAGE)-$(VERSION).tar.gz libvirt.org:/data/ftp/libvirt/ocaml/
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 \
force:
.PHONY: all opt depend install clean distclean configure dist check-manifest \