X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2FMakefile.in;h=64c4781c5f2690829ccb63bb4a087a1c6578c5f1;hb=5318d6037135dbb8f53074d8003af769132d72bd;hp=1a5fc58db09429e7eac7593ca7e4d9c1e79ec3c0;hpb=5ba50d136d1d466ba3c8f8854c89ddb835f7aa9e;p=virt-df.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1a5fc58..64c4781 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -28,19 +28,20 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 
-#OCAMLCPACKAGES	:= -package unix,extlib,bitmatch
-OCAMLCPACKAGES	:= -package unix,extlib -I +bitmatch
+OCAMLCPACKAGES	:= -package unix,extlib,bitmatch.syntax
 
 #----------------------------------------------------------------------
 # Build up the list of object files.
 
 OBJS		:= int63.cmo \
-		   diskimage_utils.cmo
+		   diskimage_impl.cmo
 
 # Plugin objects.
 OBJS		+= diskimage_ext2.cmo \
 		   diskimage_linux_swap.cmo \
 		   diskimage_linux_swsuspend.cmo \
+		   diskimage_fat.cmo \
+		   diskimage_ntfs.cmo \
 		   diskimage_lvm2_metadata.cmo \
 		   diskimage_lvm2_parser.cmo \
 		   diskimage_lvm2_lexer.cmo \
@@ -53,16 +54,14 @@ XOBJS		:= $(OBJS:.cmo=.cmx)
 
 #----------------------------------------------------------------------
 
-SYNTAX		:= -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+SYNTAX		:= -syntax bitmatch.syntax
 
 OCAMLCFLAGS	:= @OCAMLCFLAGS@ $(SYNTAX)
-#OCAMLCLIBS	:= -linkpkg
-OCAMLCLIBS	:= -linkpkg bitmatch.cma
+OCAMLCLIBS	:= -linkpkg
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS	:= @OCAMLOPTFLAGS@ $(SYNTAX)
-#OCAMLOPTLIBS	:= $(OCAMLCLIBS)
-OCAMLOPTLIBS	:= -linkpkg bitmatch.cmxa
+OCAMLOPTLIBS	:= $(OCAMLCLIBS)
 
 OCAMLDEPFLAGS	:= $(SYNTAX)
 
@@ -91,6 +90,11 @@ diskimage_lvm2_parser.cmo: diskimage_lvm2_parser.cmi
 diskimage_lvm2_parser.cmx: diskimage_lvm2_parser.cmi
 diskimage_lvm2_parser.cmi: diskimage_lvm2_parser.mli
 
+diskimage_lvm2_lexer.cmo: diskimage_impl.cmi
+diskimage_lvm2_parser.cmo: diskimage_impl.cmi
+diskimage_lvm2_lexer.cmx: diskimage_impl.cmi
+diskimage_lvm2_parser.cmx: diskimage_impl.cmi
+
 # Int63 module is defined differently on 32 and 64 bit platforms.
 int63.ml: int63_on_$(OCAML_WORD_SIZE).ml Makefile
 	rm -f $@