summaryrefslogtreecommitdiffstats
path: root/virt-top
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2008-04-16 14:11:41 +0100
committerRichard W.M. Jones <rjones@redhat.com>2008-04-16 14:11:41 +0100
commite86f4987469c26213c6693b35cde3b48a4732524 (patch)
treeda15b2cf97b8af381253d0cb89dda315c4b1e05b /virt-top
parent02f1c03c9f81e25353aae4900ce19e194b507f71 (diff)
downloadvirt-top-e86f4987469c26213c6693b35cde3b48a4732524.tar.gz
virt-top-e86f4987469c26213c6693b35cde3b48a4732524.tar.xz
virt-top-e86f4987469c26213c6693b35cde3b48a4732524.zip
*** THIS REPO IS JUST FOR VIRT-TOP NOW ***
- See http://hg.et.redhat.com/applications/virt/ for bindings and the other applications.
Diffstat (limited to 'virt-top')
-rw-r--r--virt-top/.depend22
-rwxr-xr-xvirt-top/Makefile.in11
2 files changed, 11 insertions, 22 deletions
diff --git a/virt-top/.depend b/virt-top/.depend
index 3a2985d..15e5c48 100644
--- a/virt-top/.depend
+++ b/virt-top/.depend
@@ -1,20 +1,14 @@
-virt_top.cmi: ../libvirt/libvirt.cmi
-virt_top_utils.cmi: ../libvirt/libvirt.cmi
virt_top_calendar1.cmo: virt_top_gettext.cmo virt_top.cmi
virt_top_calendar1.cmx: virt_top_gettext.cmx virt_top.cmx
virt_top_calendar2.cmo: virt_top_gettext.cmo virt_top.cmi
virt_top_calendar2.cmx: virt_top_gettext.cmx virt_top.cmx
virt_top_csv.cmo: virt_top_gettext.cmo virt_top.cmi
virt_top_csv.cmx: virt_top_gettext.cmx virt_top.cmx
-virt_top_main.cmo: virt_top_gettext.cmo virt_top.cmi ../libvirt/libvirt.cmi
-virt_top_main.cmx: virt_top_gettext.cmx virt_top.cmx ../libvirt/libvirt.cmx
-virt_top.cmo: virt_top_utils.cmi virt_top_gettext.cmo \
- ../libvirt/libvirt_version.cmi ../libvirt/libvirt.cmi virt_top.cmi
-virt_top.cmx: virt_top_utils.cmx virt_top_gettext.cmx \
- ../libvirt/libvirt_version.cmx ../libvirt/libvirt.cmx virt_top.cmi
-virt_top_utils.cmo: virt_top_gettext.cmo ../libvirt/libvirt.cmi \
- virt_top_utils.cmi
-virt_top_utils.cmx: virt_top_gettext.cmx ../libvirt/libvirt.cmx \
- virt_top_utils.cmi
-virt_top_xml.cmo: virt_top_gettext.cmo virt_top.cmi ../libvirt/libvirt.cmi
-virt_top_xml.cmx: virt_top_gettext.cmx virt_top.cmx ../libvirt/libvirt.cmx
+virt_top_main.cmo: virt_top_gettext.cmo virt_top.cmi
+virt_top_main.cmx: virt_top_gettext.cmx virt_top.cmx
+virt_top.cmo: virt_top_utils.cmi virt_top_gettext.cmo virt_top.cmi
+virt_top.cmx: virt_top_utils.cmx virt_top_gettext.cmx virt_top.cmi
+virt_top_utils.cmo: virt_top_gettext.cmo virt_top_utils.cmi
+virt_top_utils.cmx: virt_top_gettext.cmx virt_top_utils.cmi
+virt_top_xml.cmo: virt_top_gettext.cmo virt_top.cmi
+virt_top_xml.cmx: virt_top_gettext.cmx virt_top.cmx
diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
index 390fc1b..e471f93 100755
--- a/virt-top/Makefile.in
+++ b/virt-top/Makefile.in
@@ -32,7 +32,7 @@ pkg_calendar = @pkg_calendar@
pkg_calendar2 = @pkg_calendar2@
pkg_gettext = @pkg_gettext@
-OCAMLCPACKAGES := -package unix,extlib,curses,str
+OCAMLCPACKAGES := -package unix,extlib,curses,str,libvirt
ifeq ($(pkg_gettext),yes)
OCAMLCPACKAGES += -package gettext-stub
@@ -59,7 +59,6 @@ OBJS += virt_top_main.cmo
XOBJS := $(OBJS:.cmo=.cmx)
-OCAMLCPACKAGES += -I ../libvirt
OCAMLCFLAGS := -g -w s
OCAMLCLIBS := -linkpkg
@@ -67,9 +66,6 @@ OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTFLAGS := -w s
OCAMLOPTLIBS := $(OCAMLCLIBS)
-export LIBRARY_PATH=../libvirt
-export LD_LIBRARY_PATH=../libvirt
-
BYTE_TARGETS := virt-top
OPT_TARGETS := virt-top.opt
@@ -82,13 +78,12 @@ all: $(BYTE_TARGETS)
opt: $(OPT_TARGETS)
virt-top: $(OBJS)
- ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
- ../libvirt/mllibvirt.cma -o $@ $^
+ ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) -o $@ $^
virt-top.opt: $(XOBJS)
ocamlfind ocamlopt \
$(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
- ../libvirt/mllibvirt.cmxa -cclib -lncurses -o $@ $^
+ -cclib -lncurses -o $@ $^
# Manual page.
ifeq ($(HAVE_PERLDOC),perldoc)