*** THIS REPO IS JUST FOR VIRT-TOP NOW ***

[virt-top.git] / virt-top / Makefile.in

diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
index 390fc1b..e471f93 100755 (executable)
--- 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@
 
 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
 
 ifeq ($(pkg_gettext),yes)
 OCAMLCPACKAGES  += -package gettext-stub


@@ -59,7 +59,6 @@ OBJS          += virt_top_main.cmo
 
 XOBJS          := $(OBJS:.cmo=.cmx)
 
 
 XOBJS          := $(OBJS:.cmo=.cmx)
 

-OCAMLCPACKAGES  += -I ../libvirt

 OCAMLCFLAGS    := -g -w s
 OCAMLCLIBS     := -linkpkg
 
 OCAMLCFLAGS    := -g -w s
 OCAMLCLIBS     := -linkpkg
 


@@ -67,9 +66,6 @@ OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS  := -w s
 OCAMLOPTLIBS   := $(OCAMLCLIBS)
 
 OCAMLOPTFLAGS  := -w s
 OCAMLOPTLIBS   := $(OCAMLCLIBS)
 

-export LIBRARY_PATH=../libvirt
-export LD_LIBRARY_PATH=../libvirt
-

 BYTE_TARGETS   := virt-top
 OPT_TARGETS    := virt-top.opt
 
 BYTE_TARGETS   := virt-top
 OPT_TARGETS    := virt-top.opt
 


@@ -82,13 +78,12 @@ all: $(BYTE_TARGETS)
 opt: $(OPT_TARGETS)
 
 virt-top: $(OBJS)
 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) \
 
 virt-top.opt: $(XOBJS)
        ocamlfind ocamlopt \
          $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \

-         ../libvirt/mllibvirt.cmxa -cclib -lncurses -o $@ $^
+         -cclib -lncurses -o $@ $^

 
 # Manual page.
 ifeq ($(HAVE_PERLDOC),perldoc)
 
 # Manual page.
 ifeq ($(HAVE_PERLDOC),perldoc)