pkg_gettext = @pkg_gettext@
-#OCAMLCPACKAGES := -package unix,extlib,xml-light,libvirt,bitmatch -I ../lib
-OCAMLCPACKAGES := -package unix,extlib,xml-light,libvirt -I +bitmatch -I ../lib
+OCAMLCPACKAGES := -package unix,extlib,xml-light,libvirt,bitmatch.syntax,bitmatch -I ../lib
ifneq ($(pkg_gettext),no)
OCAMLCPACKAGES += -package gettext-stub
#----------------------------------------------------------------------
OCAMLCFLAGS := @OCAMLCFLAGS@
-#OCAMLCLIBS := -linkpkg diskimage.cma
-OCAMLCLIBS := -linkpkg bitmatch.cma diskimage.cma
+OCAMLCLIBS := -linkpkg diskimage.cma
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTFLAGS := @OCAMLOPTFLAGS@
-#OCAMLOPTLIBS := -linkpkg diskimage.cmxa
-OCAMLOPTLIBS := -linkpkg bitmatch.cmxa diskimage.cmxa
+OCAMLOPTLIBS := -linkpkg diskimage.cmxa
BYTE_TARGETS := virt-df
OPT_TARGETS := virt-df.opt