git.annexia.org
/
virt-top.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9c96bc8
)
pa_bitmatch package added. xml-light is now optional. MBR code now in its own file.
author
Richard W.M. Jones
<rjones@redhat.com>
Mon, 14 Apr 2008 16:48:00 +0000
(17:48 +0100)
committer
Richard W.M. Jones
<rjones@redhat.com>
Mon, 14 Apr 2008 16:48:00 +0000
(17:48 +0100)
virt-df/Makefile.in
patch
|
blob
|
history
diff --git
a/virt-df/Makefile.in
b/virt-df/Makefile.in
index
057c8e5
..
4a56d2d
100644
(file)
--- a/
virt-df/Makefile.in
+++ b/
virt-df/Makefile.in
@@
-25,10
+25,10
@@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
exec_prefix = @exec_prefix@
bindir = @bindir@
-pkg_xml_light = @pkg_xml_light@
pkg_gettext = @pkg_gettext@
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
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_ext2.cmo \
virt_df_linux_swap.cmo \
virt_df_lvm2.cmo \
+ virt_df_mbr.cmo \
virt_df_main.cmo
XOBJS := $(OBJS:.cmo=.cmx)
virt_df_main.cmo
XOBJS := $(OBJS:.cmo=.cmx)
+SYNTAX := -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+
OCAMLCPACKAGES += -I ../libvirt
OCAMLCPACKAGES += -I ../libvirt
-OCAMLCFLAGS := -g -w s
-OCAMLCLIBS := -linkpkg
+OCAMLCFLAGS := -g -w s $(SYNTAX)
+#OCAMLCLIBS := -linkpkg
+OCAMLCLIBS := -linkpkg bitmatch.cma
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
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
export LIBRARY_PATH=../libvirt
export LD_LIBRARY_PATH=../libvirt