Fix Makefiles to use new bitmatch META file.

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

diff --git a/diskzip/Makefile.in b/diskzip/Makefile.in
index a976ace..9421ffc 100644 (file)
--- a/diskzip/Makefile.in
+++ b/diskzip/Makefile.in
@@ -28,8 +28,7 @@ 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,bitmatch.syntax,bitmatch -I ../lib
 
 ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES  += -package gettext-stub
@@ -38,16 +37,14 @@ endif
 OBJS           := diskzip_gettext.cmo diskzip.cmo
 XOBJS          := $(OBJS:.cmo=.cmx)
 
-SYNTAX         := -pp "camlp4o -I`ocamlc -where`/bitmatch bitmatch.cma pa_bitmatch.cmo"
+SYNTAX         := -syntax bitmatch.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)