X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=diskzip%2FMakefile.in;h=f44d347540b2165449abd31efab8ca8a8c3ba942;hb=HEAD;hp=39ef864e5173110e1c486a377f6e8b37f701019c;hpb=11e0989400d8eb8be4c013ba478d8f0b6937fb4d;p=virt-df.git

diff --git a/diskzip/Makefile.in b/diskzip/Makefile.in
index 39ef864..f44d347 100644
--- a/diskzip/Makefile.in
+++ b/diskzip/Makefile.in
@@ -28,26 +28,23 @@ bindir		= @bindir@
 
 pkg_gettext     = @pkg_gettext@
 
-#OCAMLCPACKAGES	:= -package unix,extlib,bitmatch -I ../lib
-OCAMLCPACKAGES	:= -package unix,extlib -I +bitmatch -I ../lib
+OCAMLCPACKAGES	:= -package unix,extlib,bitstring.syntax,bitstring -I ../lib
 
 ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES  += -package gettext-stub
 endif
 
-OBJS		:= diskzip_gettext.cmo diskzip_bitmap.cmo diskzip.cmo
+OBJS		:= diskzip_gettext.cmo diskzip.cmo
 XOBJS		:= $(OBJS:.cmo=.cmx)
 
-SYNTAX		:= -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+SYNTAX		:= -syntax bitstring.syntax
 
 OCAMLCFLAGS	:= @OCAMLCFLAGS@ $(SYNTAX)
-#OCAMLCLIBS	:= -linkpkg diskimage.cma
-OCAMLCLIBS	:= -linkpkg bitmatch.cma diskimage.cma
+OCAMLCLIBS	:= -linkpkg diskimage.cma
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS	:= @OCAMLOPTFLAGS@ $(SYNTAX)
-#OCAMLOPTLIBS	:= -linkpkg diskimage.cmxa
-OCAMLOPTLIBS	:= -linkpkg bitmatch.cmxa diskimage.cmxa
+OCAMLOPTLIBS	:= -linkpkg diskimage.cmxa
 
 OCAMLDEPFLAGS   := $(SYNTAX)