Removed bitmap object - don't need to build a bitmap.

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

diff --git a/diskzip/Makefile.in b/diskzip/Makefile.in
index 27f5ede..d3032aa 100644 (file)
--- 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
@@ -39,17 +40,20 @@ XOBJS               := $(OBJS:.cmo=.cmx)
 
 SYNTAX         := -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
 
-OCAMLCFLAGS    := -g -w s $(SYNTAX)
+OCAMLCFLAGS    := @OCAMLCFLAGS@ $(SYNTAX)
 #OCAMLCLIBS    := -linkpkg diskimage.cma
 OCAMLCLIBS     := -linkpkg bitmatch.cma diskimage.cma
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS  := -w s $(SYNTAX)
+OCAMLOPTFLAGS  := @OCAMLOPTFLAGS@ $(SYNTAX)
 #OCAMLOPTLIBS  := -linkpkg diskimage.cmxa
 OCAMLOPTLIBS   := -linkpkg bitmatch.cmxa diskimage.cmxa
 
 OCAMLDEPFLAGS   := $(SYNTAX)
 
+OCAMLDOCFLAGS  := $(SYNTAX) -I +extlib -I +bitmatch -I ../lib
+OCAMLDOCFILES  := diskzip.ml
+
 BYTE_TARGETS   := diskzip
 OPT_TARGETS    := diskzip.opt
 
@@ -61,14 +65,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)