X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-df%2FMakefile.in;h=a2da6ceea3d38fb9b60ccc0b9670bfbfa3f32f06;hb=dc67dc64435bace25c779c530a4f5e6995115101;hp=0bc91390b6cfe0b9f671f9478c6c045e1869195a;hpb=fc96d842a5276a27f528fbfb382b8a4afaeb2819;p=virt-df.git

diff --git a/virt-df/Makefile.in b/virt-df/Makefile.in
index 0bc9139..a2da6ce 100644
--- a/virt-df/Makefile.in
+++ b/virt-df/Makefile.in
@@ -27,8 +27,8 @@ 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
@@ -40,15 +40,7 @@ endif
 # Library objects.
 OBJS		:= virt_df_gettext.cmo virt_df.cmo
 
-# Plugin objects.
-OBJS		+= 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
-
+# Plug-in objects.
 ifneq ($(pkg_csv),no)
 OCAMLCPACKAGES  += -package csv
 OBJS		+= virt_df_csv.cmo
@@ -61,18 +53,14 @@ 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
@@ -94,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