X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-df%2FMakefile.in;h=42033a477f715bd0d75fa6fdb6379997fb5f8df9;hb=f38f6e2328265da41959518eadbc6a460edfd8b5;hp=a2da6ceea3d38fb9b60ccc0b9670bfbfa3f32f06;hpb=9611aba66734efe3e2f1e0792a90003b657a89f5;p=virt-df.git

diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in
index a2da6ce..42033a4 100644
--- a/virt-df/Makefile.in
+++ b/virt-df/Makefile.in
@@ -1,5 +1,6 @@
 # virt-df
-# Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
+# @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
 # it under the terms of the GNU General Public License as published by
@@ -34,6 +35,10 @@ ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES  += -package gettext-stub
 endif
 
+OCAMLDOCFLAGS	:= -I +extlib -I +bitmatch -I +libvirt -I +xml-light \
+	          -I +csv -I +gettext -I +gettext-stub -I ../lib
+OCAMLDOCFILES	:= $(wildcard *.mli) $(wildcard *.ml)
+
 #----------------------------------------------------------------------
 # Build up the list of object files.
 
@@ -53,12 +58,12 @@ XOBJS		:= $(OBJS:.cmo=.cmx)
 
 #----------------------------------------------------------------------
 
-OCAMLCFLAGS	:= -g -w s
+OCAMLCFLAGS	:= @OCAMLCFLAGS@
 #OCAMLCLIBS	:= -linkpkg diskimage.cma
 OCAMLCLIBS	:= -linkpkg bitmatch.cma diskimage.cma
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS	:= -w s
+OCAMLOPTFLAGS	:= @OCAMLOPTFLAGS@
 #OCAMLOPTLIBS	:= -linkpkg diskimage.cmxa
 OCAMLOPTLIBS	:= -linkpkg bitmatch.cmxa diskimage.cmxa
 
@@ -73,14 +78,14 @@ all: $(BYTE_TARGETS)
 
 opt: $(OPT_TARGETS)
 
-virt-df: $(OBJS)
+virt-df: $(OBJS) ../lib/diskimage.cma
 	ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-	  -o $@ $^
+	  -o $@ $(OBJS)
 
-virt-df.opt: $(XOBJS)
+virt-df.opt: $(XOBJS) ../lib/diskimage.cmxa
 	ocamlfind ocamlopt \
 	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  -o $@ $^
+	  -o $@ $(XOBJS)
 
 # Manual page.
 ifeq ($(HAVE_PERLDOC),perldoc)