summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2008-04-14 17:48:00 +0100
committerRichard W.M. Jones <rjones@redhat.com>2008-04-14 17:48:00 +0100
commit69a06d25bf078f994b3e17a4da1af765bb40ea1f (patch)
treee545affc83deeff1cb8003f42aacb5d8234a0729
parent9c96bc8ba014fe5d9bdf84234015446e745ee2b8 (diff)
downloadvirt-top-69a06d25bf078f994b3e17a4da1af765bb40ea1f.tar.gz
virt-top-69a06d25bf078f994b3e17a4da1af765bb40ea1f.tar.xz
virt-top-69a06d25bf078f994b3e17a4da1af765bb40ea1f.zip
pa_bitmatch package added. xml-light is now optional. MBR code now in its own file.
-rw-r--r--virt-df/Makefile.in19
1 files changed, 13 insertions, 6 deletions
diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in
index 057c8e5..4a56d2d 100644
--- a/virt-df/Makefile.in
+++ b/virt-df/Makefile.in
@@ -25,10 +25,10 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-pkg_xml_light = @pkg_xml_light@
pkg_gettext = @pkg_gettext@
-OCAMLCPACKAGES := -package unix,extlib,xml-light
+#OCAMLCPACKAGES := -package unix,extlib,xml-light,bitmatch
+OCAMLCPACKAGES := -package unix,extlib,xml-light -I +bitmatch
ifneq ($(pkg_gettext),no)
OCAMLCPACKAGES += -package gettext-stub
@@ -40,17 +40,24 @@ OBJS := \
virt_df_ext2.cmo \
virt_df_linux_swap.cmo \
virt_df_lvm2.cmo \
+ virt_df_mbr.cmo \
virt_df_main.cmo
XOBJS := $(OBJS:.cmo=.cmx)
+SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+
OCAMLCPACKAGES += -I ../libvirt
-OCAMLCFLAGS := -g -w s
-OCAMLCLIBS := -linkpkg
+OCAMLCFLAGS := -g -w s $(SYNTAX)
+#OCAMLCLIBS := -linkpkg
+OCAMLCLIBS := -linkpkg bitmatch.cma
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS := -w s
-OCAMLOPTLIBS := $(OCAMLCLIBS)
+OCAMLOPTFLAGS := -w s $(SYNTAX)
+#OCAMLOPTLIBS := $(OCAMLCLIBS)
+OCAMLOPTLIBS := -linkpkg bitmatch.cmxa
+
+OCAMLDEPFLAGS := $(SYNTAX)
export LIBRARY_PATH=../libvirt
export LD_LIBRARY_PATH=../libvirt