From 46d3772c9a5cf786fa4fbdb2ba29512580101f32 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 28 Mar 2008 17:30:32 +0000
Subject: Internationalize virt-top.

---
 virt-top/Makefile.in | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'virt-top/Makefile.in')

diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
index 31cd828..390fc1b 100755
--- a/virt-top/Makefile.in
+++ b/virt-top/Makefile.in
@@ -30,25 +30,30 @@ 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
 
-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
 
-- 
cgit 


From e86f4987469c26213c6693b35cde3b48a4732524 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 16 Apr 2008 14:11:41 +0100
Subject: *** THIS REPO IS JUST FOR VIRT-TOP NOW ***  - See
 http://hg.et.redhat.com/applications/virt/ for bindings and    the other
 applications.

---
 virt-top/Makefile.in | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'virt-top/Makefile.in')

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)
-- 
cgit