Added #contiguous method to make block mapping more efficient, and

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

diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in
index 0cc51a0..837bb99 100644 (file)
--- a/virt-df/Makefile.in
+++ b/virt-df/Makefile.in
@@ -1,5 +1,5 @@
 # virt-df
-# Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
+# 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
@@ -27,39 +27,40 @@ bindir              = @bindir@
 
 pkg_gettext     = @pkg_gettext@
 
-#OCAMLCPACKAGES        := -package unix,extlib,xml-light,bitmatch
-OCAMLCPACKAGES := -package unix,extlib,xml-light,libvirt -I +bitmatch
+#OCAMLCPACKAGES        := -package unix,extlib,xml-light,libvirt,bitmatch -I ../lib
+OCAMLCPACKAGES := -package unix,extlib,xml-light,libvirt -I +bitmatch -I ../lib
 
 ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES  += -package gettext-stub
 endif
 
-OBJS           := \
-       virt_df_gettext.cmo \
-       virt_df.cmo \
-       virt_df_ext2.cmo \
-       virt_df_linux_swap.cmo \
-       virt_df_lvm2_metadata.cmo \
-       virt_df_lvm2_parser.cmo \
-       virt_df_lvm2_lexer.cmo \
-       virt_df_lvm2.cmo \
-       virt_df_mbr.cmo \
-       virt_df_main.cmo
+#----------------------------------------------------------------------
+# Build up the list of object files.
+
+# Library objects.
+OBJS           := virt_df_gettext.cmo virt_df.cmo
+
+# Plug-in objects.
+ifneq ($(pkg_csv),no)
+OCAMLCPACKAGES  += -package csv
+OBJS           += virt_df_csv.cmo
+endif
+
+# Main program.
+OBJS           += virt_df_main.cmo
 
 XOBJS          := $(OBJS:.cmo=.cmx)
 
-SYNTAX         := -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+#----------------------------------------------------------------------
 
-OCAMLCFLAGS    := -g -w s $(SYNTAX)
-#OCAMLCLIBS    := -linkpkg
-OCAMLCLIBS     := -linkpkg bitmatch.cma
+OCAMLCFLAGS    := -g -w s
+#OCAMLCLIBS    := -linkpkg diskimage.cma
+OCAMLCLIBS     := -linkpkg bitmatch.cma diskimage.cma
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS  := -w s $(SYNTAX)
-#OCAMLOPTLIBS  := $(OCAMLCLIBS)
-OCAMLOPTLIBS   := -linkpkg bitmatch.cmxa
-
-OCAMLDEPFLAGS  := $(SYNTAX)
+OCAMLOPTFLAGS  := -w s
+#OCAMLOPTLIBS  := -linkpkg diskimage.cmxa
+OCAMLOPTLIBS   := -linkpkg bitmatch.cmxa diskimage.cmxa
 
 BYTE_TARGETS   := virt-df
 OPT_TARGETS    := virt-df.opt
@@ -81,12 +82,6 @@ virt-df.opt: $(XOBJS)
          $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
          -o $@ $^
 
-# 'make depend' doesn't catch these dependencies because the .mli file
-# is auto-generated.
-virt_df_lvm2_parser.cmi: virt_df_lvm2_parser.mli
-virt_df_lvm2_parser.cmo: virt_df_lvm2_parser.mli
-virt_df_lvm2_parser.cmx: virt_df_lvm2_parser.mli
-
 # Manual page.
 ifeq ($(HAVE_PERLDOC),perldoc)
 virt-df.1: virt-df.pod