summaryrefslogtreecommitdiffstats
path: root/virt-top
diff options
context:
space:
mode:
authorRichard Jones <rjones@trick.home.annexia.org>2009-10-06 15:04:25 +0100
committerRichard Jones <rjones@trick.home.annexia.org>2009-10-06 15:04:25 +0100
commitd0381948857fa48c1c1e24cac01997a57c067403 (patch)
tree3ff23924ba8a316e24eb754da68b9c59e7899a77 /virt-top
parent9f869ebd731800a0307842f3997da084a98ffe86 (diff)
downloadvirt-top-d0381948857fa48c1c1e24cac01997a57c067403.tar.gz
virt-top-d0381948857fa48c1c1e24cac01997a57c067403.tar.xz
virt-top-d0381948857fa48c1c1e24cac01997a57c067403.zip
Change over to using ocaml.m4 macros.
Diffstat (limited to 'virt-top')
-rwxr-xr-xvirt-top/Makefile.in25
1 files changed, 13 insertions, 12 deletions
diff --git a/virt-top/Makefile.in b/virt-top/Makefile.in
index 64c222e..0d0ccdc 100755
--- a/virt-top/Makefile.in
+++ b/virt-top/Makefile.in
@@ -25,16 +25,16 @@ 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,libvirt
-ifeq ($(pkg_gettext),yes)
+ifneq ($(OCAML_PKG_gettext),no)
OCAMLCPACKAGES += -package gettext-stub
endif
@@ -43,22 +43,23 @@ OBJS := \
virt_top_gettext.cmo \
virt_top_utils.cmo \
virt_top.cmo
-ifeq ($(pkg_xml_light),yes)
+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)