X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-df%2FMakefile.in;h=f140f14098bc685bfca5e13941f06cfd462b644e;hb=7ad89902cab806330bda56e283ff1c79686d68ca;hp=4fb088c1212f050290c734f5be8e90deee74a7b3;hpb=49ec200e1391ff462fce459f1c9159a53883badf;p=virt-df.git

diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in
index 4fb088c..f140f14 100644
--- 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,43 +27,40 @@ bindir		= @bindir@
 
 pkg_gettext     = @pkg_gettext@
 
-#OCAMLCPACKAGES	:= -package unix,extlib,xml-light,bitmatch
-OCAMLCPACKAGES	:= -package unix,extlib,xml-light -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.
 
-XOBJS		:= $(OBJS:.cmo=.cmx)
+# Library objects.
+OBJS		:= virt_df_gettext.cmo virt_df.cmo
 
-SYNTAX		:= -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+# Plug-in objects.
+ifneq ($(pkg_csv),no)
+OCAMLCPACKAGES  += -package csv
+OBJS		+= virt_df_csv.cmo
+endif
 
-OCAMLCPACKAGES  += -I ../libvirt
-OCAMLCFLAGS	:= -g -w s $(SYNTAX)
-#OCAMLCLIBS	:= -linkpkg
-OCAMLCLIBS	:= -linkpkg bitmatch.cma
+# Main program.
+OBJS		+= virt_df_main.cmo
 
-OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS	:= -w s $(SYNTAX)
-#OCAMLOPTLIBS	:= $(OCAMLCLIBS)
-OCAMLOPTLIBS	:= -linkpkg bitmatch.cmxa
+XOBJS		:= $(OBJS:.cmo=.cmx)
 
-OCAMLDEPFLAGS	:= $(SYNTAX)
+#----------------------------------------------------------------------
 
-export LIBRARY_PATH=../libvirt
-export LD_LIBRARY_PATH=../libvirt
+OCAMLCFLAGS	:= @OCAMLCFLAGS@
+#OCAMLCLIBS	:= -linkpkg diskimage.cma
+OCAMLCLIBS	:= -linkpkg bitmatch.cma diskimage.cma
+
+OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
+OCAMLOPTFLAGS	:= @OCAMLOPTFLAGS@
+#OCAMLOPTLIBS	:= -linkpkg diskimage.cmxa
+OCAMLOPTLIBS	:= -linkpkg bitmatch.cmxa diskimage.cmxa
 
 BYTE_TARGETS	:= virt-df
 OPT_TARGETS	:= virt-df.opt
@@ -76,19 +73,14 @@ all: $(BYTE_TARGETS)
 
 opt: $(OPT_TARGETS)
 
-virt-df: $(OBJS)
+virt-df: $(OBJS) ../lib/diskimage.cma
 	ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-	  ../libvirt/mllibvirt.cma -o $@ $^
+	  -o $@ $(OBJS)
 
-virt-df.opt: $(XOBJS)
+virt-df.opt: $(XOBJS) ../lib/diskimage.cmxa
 	ocamlfind ocamlopt \
 	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
-	  ../libvirt/mllibvirt.cmxa -o $@ $^
-
-# 'make depend' doesn't catch these dependencies because the .mli file
-# is auto-generated.
-virt_df_lvm2_parser.cmo: virt_df_lvm2_parser.mli
-virt_df_lvm2_parser.cmx: virt_df_lvm2_parser.mli
+	  -o $@ $(XOBJS)
 
 # Manual page.
 ifeq ($(HAVE_PERLDOC),perldoc)