X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=diskzip%2FMakefile.in;h=f44d347540b2165449abd31efab8ca8a8c3ba942;hb=3af76b1a2e4d2e1cfa5fc41dfd4c1ddb397cedbb;hp=27f5ede946efe4f8056a443a1512fb489f41c70c;hpb=0b2bee9a672e5884f17ef231daf12daa89c26126;p=virt-df.git

diff --git a/diskzip/Makefile.in b/diskzip/Makefile.in
index 27f5ede..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)
 
@@ -61,14 +59,14 @@ all: $(BYTE_TARGETS)
 
 opt: $(OPT_TARGETS)
 
-diskzip: $(OBJS)
+diskzip: $(OBJS) ../lib/diskimage.cma
 	ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-	  -o $@ $^
+	  -o $@ $(OBJS)
 
-diskzip.opt: $(XOBJS)
+diskzip.opt: $(XOBJS) ../lib/diskimage.cmxa
 	ocamlfind ocamlopt \
 	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  -o $@ $^
+	  -o $@ $(XOBJS)
 
 # Manual page.
 ifeq ($(HAVE_PERLDOC),perldoc)