X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=virt-top%2FMakefile.in;h=64c222ebc580dce30496afae708f0abefa74bcf6;hp=d31cfc4a9084b5b9ab669eac03a67bc5f09d289e;hb=ea218fb3fe5100e5e1e61abff36f40bd79a757ca;hpb=627e6f64b0cd359a8f03d45ab093592f000cf6e6

diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
index d31cfc4..64c222e 100755
--- a/virt-top/Makefile.in
+++ b/virt-top/Makefile.in
@@ -30,31 +30,39 @@ 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_version.cmo \
+		   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
-ifneq ($(pkg_calendar),)
+ifeq ($(pkg_calendar),yes)
 OBJS		+= virt_top_calendar1.cmo
-OCAMLCPACKAGES	:= $(OCAMLCPACKAGES),calendar
+OCAMLCPACKAGES	+= -package calendar
 endif
-ifneq ($(pkg_calendar2),)
+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 +70,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 +82,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 $@ $^
+	  -o $@ $^
 
 # Manual page.
 ifeq ($(HAVE_PERLDOC),perldoc)