X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=virt-top%2FMakefile.in;h=6a782cb800850af1c9aec0b97d18098dff5a57f8;hp=390fc1b57dc225887a20361837b764e06da5dede;hb=10d17d2a88b041b111a72a760caa1c0571bfac92;hpb=46d3772c9a5cf786fa4fbdb2ba29512580101f32;ds=sidebyside

diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
index 390fc1b..6a782cb 100755
--- a/virt-top/Makefile.in
+++ b/virt-top/Makefile.in
@@ -25,51 +25,52 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 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@
+OCAML_PKG_curses    = @OCAML_PKG_curses@
+OCAML_PKG_xml_light = @OCAML_PKG_xml_light@
+OCAML_PKG_csv	    = @OCAML_PKG_csv@
+OCAML_PKG_calendar  = @OCAML_PKG_calendar@
+is_calendar2	    = @is_calendar2@
+OCAML_PKG_gettext   = @OCAML_PKG_gettext@
 
-OCAMLCPACKAGES	:= -package unix,extlib,curses,str
+OCAMLCPACKAGES	:= -package unix,extlib,curses,str,libvirt
 
-ifeq ($(pkg_gettext),yes)
+ifneq ($(OCAML_PKG_gettext),no)
 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_version.cmo \
+		   virt_top_gettext.cmo \
+		   virt_top_utils.cmo \
+		   virt_top.cmo
+ifneq ($(OCAML_PKG_xml_light),no)
 OBJS		+= virt_top_xml.cmo
 OCAMLCPACKAGES	+= -package xml-light
 endif
-ifeq ($(pkg_csv),yes)
+ifneq ($(OCAML_PKG_csv),no)
 OBJS		+= virt_top_csv.cmo
 OCAMLCPACKAGES	+= -package csv
 endif
-ifeq ($(pkg_calendar),yes)
+ifneq ($(OCAML_PKG_calendar),no)
+ifeq ($(is_calendar2),no)
 OBJS		+= virt_top_calendar1.cmo
 OCAMLCPACKAGES	+= -package calendar
-endif
-ifneq ($(pkg_calendar2),no)
+else
 OBJS		+= virt_top_calendar2.cmo
 OCAMLCPACKAGES	+= -package calendar
 endif
+endif
 OBJS		+= virt_top_main.cmo
 
 XOBJS		:= $(OBJS:.cmo=.cmx)
 
-OCAMLCPACKAGES  += -I ../libvirt
-OCAMLCFLAGS	:= -g -w s
+OCAMLCFLAGS	:= -g -warn-error A
 OCAMLCLIBS	:= -linkpkg
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS	:= -w s
+OCAMLOPTFLAGS	:= -warn-error A
 OCAMLOPTLIBS	:= $(OCAMLCLIBS)
 
-export LIBRARY_PATH=../libvirt
-export LD_LIBRARY_PATH=../libvirt
-
 BYTE_TARGETS	:= virt-top
 OPT_TARGETS	:= virt-top.opt
 
@@ -82,13 +83,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)