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
Cosmetic fixes and comments.
[virt-top.git]
/
virt-ctrl
/
Makefile.in
diff --git
a/virt-ctrl/Makefile.in
b/virt-ctrl/Makefile.in
index
5ef6362
..
7e7c5c4
100644
(file)
--- a/
virt-ctrl/Makefile.in
+++ b/
virt-ctrl/Makefile.in
@@
-21,28
+21,41
@@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
exec_prefix = @exec_prefix@
bindir = @bindir@
+with_icons = @with_icons@
+icons = @icons@
+
+HAVE_GDK_PIXBUF_MLSOURCE = @HAVE_GDK_PIXBUF_MLSOURCE@
+
pkg_dbus = @pkg_dbus@
pkg_dbus = @pkg_dbus@
+pkg_gettext = @pkg_gettext@
OCAMLFIND = @OCAMLFIND@
OCAMLFIND = @OCAMLFIND@
-OBJS := \
+OBJS := \
+ virt_ctrl_gettext.cmo \
vc_helpers.cmo \
vc_connections.cmo \
vc_domain_ops.cmo \
vc_helpers.cmo \
vc_connections.cmo \
vc_domain_ops.cmo \
+ vc_connection_dlg.cmo \
vc_mainwindow.cmo
ifneq ($(OCAMLFIND),)
vc_mainwindow.cmo
ifneq ($(OCAMLFIND),)
+# Good, we have ocamlfind.
OCAMLCPACKAGES := -I ../libvirt -package unix,lablgtk2
ifeq ($(pkg_dbus),yes)
OCAMLCPACKAGES := -I ../libvirt -package unix,lablgtk2
ifeq ($(pkg_dbus),yes)
-OCAMLCPACKAGES
:= $(OCAMLCPACKAGES),
dbus
+OCAMLCPACKAGES
+= -package
dbus
OBJS += vc_dbus.cmo
endif
OBJS += vc_dbus.cmo
endif
+ifeq ($(pkg_gettext),yes)
+OCAMLCPACKAGES += -package gettext-stub
+endif
OCAMLCFLAGS := -g
OCAMLCLIBS := -linkpkg
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTFLAGS :=
OCAMLOPTLIBS := $(OCAMLCLIBS)
else
OCAMLCFLAGS := -g
OCAMLCLIBS := -linkpkg
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTFLAGS :=
OCAMLOPTLIBS := $(OCAMLCLIBS)
else
+# Bad boy, please install ocamlfind.
OCAMLCINCS := -I ../libvirt -I @pkg_lablgtk2@
OCAMLCFLAGS := -g
OCAMLCLIBS := unix.cma lablgtk.cma
OCAMLCINCS := -I ../libvirt -I @pkg_lablgtk2@
OCAMLCFLAGS := -g
OCAMLCLIBS := unix.cma lablgtk.cma
@@
-51,6
+64,10
@@
OCAMLOPTFLAGS :=
OCAMLOPTLIBS := unix.cmxa lablgtk.cmxa
endif
OCAMLOPTLIBS := unix.cmxa lablgtk.cmxa
endif
+ifneq ($(with_icons),no)
+OBJS += vc_icons.cmo
+endif
+
export LIBRARY_PATH=../libvirt
export LD_LIBRARY_PATH=../libvirt
export LIBRARY_PATH=../libvirt
export LD_LIBRARY_PATH=../libvirt
@@
-100,6
+117,16
@@
virt-ctrl.opt: $(XOBJS) gcc.exe
endif
endif
endif
endif
+# Rebuild the icons if newer ones available.
+ifneq ($(with_icons),no)
+ifneq ($(icons),)
+ifeq ($(HAVE_GDK_PIXBUF_MLSOURCE),gdk-pixbuf-mlsource)
+vc_icons.ml: rebuild-icons.sh
+ ./rebuild-icons.sh $(icons) > $@
+endif
+endif
+endif
+
install:
if [ -x virt-ctrl.opt ]; then \
mkdir -p $(DESTDIR)$(bindir); \
install:
if [ -x virt-ctrl.opt ]; then \
mkdir -p $(DESTDIR)$(bindir); \