*** 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 31cd828..e471f93 100755 (executable)
--- a/virt-top/Makefile.in
+++ b/virt-top/Makefile.in
@@ -30,31 +30,35 @@ pkg_xml_light       = @pkg_xml_light@
 pkg_csv                = @pkg_csv@
 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
 
-OBJS           := virt_top_utils.cmo virt_top.cmo
+ifeq ($(pkg_gettext),yes)
+OCAMLCPACKAGES  += -package gettext-stub
+endif
+
+OBJS           := virt_top_gettext.cmo virt_top_utils.cmo virt_top.cmo
 ifeq ($(pkg_xml_light),yes)
 OBJS           += virt_top_xml.cmo
-OCAMLCPACKAGES := $(OCAMLCPACKAGES),xml-light
+OCAMLCPACKAGES += -package xml-light
 endif
 ifeq ($(pkg_csv),yes)
 OBJS           += virt_top_csv.cmo
-OCAMLCPACKAGES := $(OCAMLCPACKAGES),csv
+OCAMLCPACKAGES += -package csv
 endif
 ifeq ($(pkg_calendar),yes)
 OBJS           += virt_top_calendar1.cmo
-OCAMLCPACKAGES := $(OCAMLCPACKAGES),calendar
+OCAMLCPACKAGES += -package calendar
 endif
 ifneq ($(pkg_calendar2),no)
 OBJS           += virt_top_calendar2.cmo
-OCAMLCPACKAGES := $(OCAMLCPACKAGES),calendar
+OCAMLCPACKAGES += -package calendar
 endif
 OBJS           += virt_top_main.cmo
 
 XOBJS          := $(OBJS:.cmo=.cmx)
 
-OCAMLCPACKAGES  += -I ../libvirt
 OCAMLCFLAGS    := -g -w s
 OCAMLCLIBS     := -linkpkg
 
@@ -62,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
 
@@ -77,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)