X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=diskzip%2FMakefile.in;h=f44d347540b2165449abd31efab8ca8a8c3ba942;hb=HEAD;hp=6cbc50ecf408af93c38c7fe29318df0e3d2d02a9;hpb=817ac8746e7e69df161e8ce45e1ee4a3282469d3;p=virt-df.git

diff --git a/diskzip/Makefile.in b/diskzip/Makefile.in
index 6cbc50e..f44d347 100644
--- a/diskzip/Makefile.in
+++ b/diskzip/Makefile.in
@@ -1,4 +1,5 @@
 # diskzip
+# @configure_input@
 # Copyright (C) 2007-2008 Red Hat Inc., Richard W.M. Jones
 #
 # This program is free software; you can redistribute it and/or modify
@@ -27,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,bitstring.syntax,bitstring -I ../lib
 
 ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES  += -package gettext-stub
@@ -37,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 bitstring.syntax
 
-OCAMLCFLAGS	:= -g -w s $(SYNTAX)
-#OCAMLCLIBS	:= -linkpkg diskimage.cma
-OCAMLCLIBS	:= -linkpkg bitmatch.cma diskimage.cma
+OCAMLCFLAGS	:= @OCAMLCFLAGS@ $(SYNTAX)
+OCAMLCLIBS	:= -linkpkg diskimage.cma
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS	:= -w s $(SYNTAX)
-#OCAMLOPTLIBS	:= -linkpkg diskimage.cmxa
-OCAMLOPTLIBS	:= -linkpkg bitmatch.cmxa diskimage.cmxa
+OCAMLOPTFLAGS	:= @OCAMLOPTFLAGS@ $(SYNTAX)
+OCAMLOPTLIBS	:= -linkpkg diskimage.cmxa
 
 OCAMLDEPFLAGS   := $(SYNTAX)