X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=diskzip%2FMakefile.in;h=9421ffc7280db4dd59123f926193effc6c793833;hb=15ea8d7da6be553a1a21611df57466144c56f129;hp=d3032aa30f36a0a9d694bb49e40d47f424a82508;hpb=e73ed9cb3c49a0acf9861ec1e5b3cf5ee2cd4efd;p=virt-df.git

diff --git a/diskzip/Makefile.in b/diskzip/Makefile.in
index d3032aa..9421ffc 100644
--- 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 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)