Fixed build.

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

diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in
index 4fb088c..0cc51a0 100644 (file)
--- a/virt-df/Makefile.in
+++ b/virt-df/Makefile.in
@@ -28,7 +28,7 @@ bindir                = @bindir@
 pkg_gettext     = @pkg_gettext@
 
 #OCAMLCPACKAGES        := -package unix,extlib,xml-light,bitmatch
-OCAMLCPACKAGES := -package unix,extlib,xml-light -I +bitmatch
+OCAMLCPACKAGES := -package unix,extlib,xml-light,libvirt -I +bitmatch
 
 ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES  += -package gettext-stub
@@ -50,7 +50,6 @@ XOBJS         := $(OBJS:.cmo=.cmx)
 
 SYNTAX         := -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
 
-OCAMLCPACKAGES  += -I ../libvirt
 OCAMLCFLAGS    := -g -w s $(SYNTAX)
 #OCAMLCLIBS    := -linkpkg
 OCAMLCLIBS     := -linkpkg bitmatch.cma
@@ -62,9 +61,6 @@ OCAMLOPTLIBS  := -linkpkg bitmatch.cmxa
 
 OCAMLDEPFLAGS  := $(SYNTAX)
 
-export LIBRARY_PATH=../libvirt
-export LD_LIBRARY_PATH=../libvirt
-
 BYTE_TARGETS   := virt-df
 OPT_TARGETS    := virt-df.opt
 
@@ -78,15 +74,16 @@ opt: $(OPT_TARGETS)
 
 virt-df: $(OBJS)
        ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-         ../libvirt/mllibvirt.cma -o $@ $^
+         -o $@ $^
 
 virt-df.opt: $(XOBJS)
        ocamlfind ocamlopt \
          $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-         ../libvirt/mllibvirt.cmxa -o $@ $^
+         -o $@ $^
 
 # 'make depend' doesn't catch these dependencies because the .mli file
 # is auto-generated.
+virt_df_lvm2_parser.cmi: virt_df_lvm2_parser.mli
 virt_df_lvm2_parser.cmo: virt_df_lvm2_parser.mli
 virt_df_lvm2_parser.cmx: virt_df_lvm2_parser.mli