X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=virt-top%2FMakefile.in;h=64c222ebc580dce30496afae708f0abefa74bcf6;hb=668ea8dfcd13c14ea859a3ee60ffbd33725af91a;hp=354ab170a2150f51ff61162725e1192ee7778bfc;hpb=0e09861c06a0c274bcfdacceaee347f8aaa969cb;p=virt-top.git

diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
old mode 100644
new mode 100755
index 354ab17..64c222e
--- a/virt-top/Makefile.in
+++ b/virt-top/Makefile.in
@@ -1,3 +1,20 @@
+# virt-top
+# Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 PACKAGE		:= @PACKAGE_NAME@
 VERSION		:= @PACKAGE_VERSION@
 
@@ -11,23 +28,41 @@ bindir		= @bindir@
 pkg_curses	= @pkg_curses@
 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,libvirt
 
-OCAMLCPACKAGES	:= -package unix,extlib,curses,str
+ifeq ($(pkg_gettext),yes)
+OCAMLCPACKAGES  += -package gettext-stub
+endif
 
-OBJS		:= virt_top_utils.cmo virt_top.cmo
+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
+ifeq ($(pkg_calendar),yes)
+OBJS		+= virt_top_calendar1.cmo
+OCAMLCPACKAGES	+= -package calendar
+endif
+ifneq ($(pkg_calendar2),no)
+OBJS		+= virt_top_calendar2.cmo
+OCAMLCPACKAGES	+= -package calendar
 endif
 OBJS		+= virt_top_main.cmo
 
 XOBJS		:= $(OBJS:.cmo=.cmx)
 
-OCAMLCPACKAGES  += -I ../libvirt
 OCAMLCFLAGS	:= -g -w s
 OCAMLCLIBS	:= -linkpkg
 
@@ -35,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
 
@@ -50,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)