Fix Makefiles to use new bitmatch META file.

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

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 771968c..64c4781 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -28,8 +28,7 @@ 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.
@@ -41,6 +40,8 @@ OBJS          := int63.cmo \
 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)