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
Added a separate file and dependency for DBus.
[virt-top.git]
/
virt-ctrl
/
Makefile.in
diff --git
a/virt-ctrl/Makefile.in
b/virt-ctrl/Makefile.in
index
26d6fe5
..
5ef6362
100644
(file)
--- a/
virt-ctrl/Makefile.in
+++ b/
virt-ctrl/Makefile.in
@@
-21,17
+21,29
@@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
exec_prefix = @exec_prefix@
bindir = @bindir@
+pkg_dbus = @pkg_dbus@
+
OCAMLFIND = @OCAMLFIND@
OCAMLFIND = @OCAMLFIND@
+OBJS := \
+ vc_helpers.cmo \
+ vc_connections.cmo \
+ vc_domain_ops.cmo \
+ vc_mainwindow.cmo
+
ifneq ($(OCAMLFIND),)
ifneq ($(OCAMLFIND),)
-OCAMLCPACKAGES := -package unix,lablgtk2 -I ../libvirt
+OCAMLCPACKAGES := -I ../libvirt -package unix,lablgtk2
+ifeq ($(pkg_dbus),yes)
+OCAMLCPACKAGES := $(OCAMLCPACKAGES),dbus
+OBJS += vc_dbus.cmo
+endif
OCAMLCFLAGS := -g
OCAMLCLIBS := -linkpkg
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTFLAGS :=
OCAMLOPTLIBS := $(OCAMLCLIBS)
else
OCAMLCFLAGS := -g
OCAMLCLIBS := -linkpkg
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTFLAGS :=
OCAMLOPTLIBS := $(OCAMLCLIBS)
else
-OCAMLCINCS := -I
@pkg_lablgtk2@ -I ../libvirt
+OCAMLCINCS := -I
../libvirt -I @pkg_lablgtk2@
OCAMLCFLAGS := -g
OCAMLCLIBS := unix.cma lablgtk.cma
OCAMLOPTINCS := $(OCAMLCINCS)
OCAMLCFLAGS := -g
OCAMLCLIBS := unix.cma lablgtk.cma
OCAMLOPTINCS := $(OCAMLCINCS)
@@
-45,12
+57,7
@@
export LD_LIBRARY_PATH=../libvirt
BYTE_TARGETS := virt-ctrl
OPT_TARGETS := virt-ctrl.opt
BYTE_TARGETS := virt-ctrl
OPT_TARGETS := virt-ctrl.opt
-OBJS := \
- vc_helpers.cmo \
- vc_connections.cmo \
- vc_domain_ops.cmo \
- vc_mainwindow.cmo \
- virt_ctrl.cmo
+OBJS += virt_ctrl.cmo
XOBJS := $(OBJS:.cmo=.cmx)
XOBJS := $(OBJS:.cmo=.cmx)