HACKING file, update (C) messages.

[virt-top.git] / virt-top / Makefile.in

diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
index 31cd828..34f1ad6 100755 (executable)
--- a/virt-top/Makefile.in
+++ b/virt-top/Makefile.in
@@ -1,5 +1,5 @@
 # virt-top
-# Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
+# Copyright (C) 2007-2009 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
@@ -25,46 +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@
+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
 
-OBJS           := virt_top_utils.cmo virt_top.cmo
-ifeq ($(pkg_xml_light),yes)
+ifneq ($(OCAML_PKG_gettext),no)
+OCAMLCPACKAGES  += -package gettext-stub
+endif
+
+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 := $(OCAMLCPACKAGES),xml-light
+OCAMLCPACKAGES += -package xml-light
 endif
-ifeq ($(pkg_csv),yes)
+ifneq ($(OCAML_PKG_csv),no)
 OBJS           += virt_top_csv.cmo
-OCAMLCPACKAGES := $(OCAMLCPACKAGES),csv
+OCAMLCPACKAGES += -package csv
 endif
-ifeq ($(pkg_calendar),yes)
+ifneq ($(OCAML_PKG_calendar),no)
+ifeq ($(is_calendar2),no)
 OBJS           += virt_top_calendar1.cmo
-OCAMLCPACKAGES := $(OCAMLCPACKAGES),calendar
-endif
-ifneq ($(pkg_calendar2),no)
+OCAMLCPACKAGES += -package calendar
+else
 OBJS           += virt_top_calendar2.cmo
-OCAMLCPACKAGES := $(OCAMLCPACKAGES),calendar
+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
 
@@ -77,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)