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 \
#----------------------------------------------------------------------
-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)
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 $@