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

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 794447a..64c4781 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,5 @@
 # Diskimage library.
+# @configure_input@
 # Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones
 #
 # This program is free software; you can redistribute it and/or modify
@@ -27,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 \
@@ -52,19 +54,20 @@ XOBJS		:= $(OBJS:.cmo=.cmx)
 
 #----------------------------------------------------------------------
 
-SYNTAX		:= -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+SYNTAX		:= -syntax bitmatch.syntax
 
-OCAMLCFLAGS	:= -g -w s -dtypes $(SYNTAX)
-#OCAMLCLIBS	:= -linkpkg
-OCAMLCLIBS	:= -linkpkg bitmatch.cma
+OCAMLCFLAGS	:= @OCAMLCFLAGS@ $(SYNTAX)
+OCAMLCLIBS	:= -linkpkg
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS	:= -w s $(SYNTAX)
-#OCAMLOPTLIBS	:= $(OCAMLCLIBS)
-OCAMLOPTLIBS	:= -linkpkg bitmatch.cmxa
+OCAMLOPTFLAGS	:= @OCAMLOPTFLAGS@ $(SYNTAX)
+OCAMLOPTLIBS	:= $(OCAMLCLIBS)
 
 OCAMLDEPFLAGS	:= $(SYNTAX)
 
+OCAMLDOCFLAGS	+= $(SYNTAX) -I +extlib -I +bitmatch
+OCAMLDOCFILES	:= int63.mli diskimage.mli
+
 BYTE_TARGETS	:= diskimage.cma
 OPT_TARGETS	:= diskimage.cmxa
 
@@ -87,21 +90,30 @@ diskimage_lvm2_parser.cmo: diskimage_lvm2_parser.cmi
 diskimage_lvm2_parser.cmx: diskimage_lvm2_parser.cmi
 diskimage_lvm2_parser.cmi: diskimage_lvm2_parser.mli
 
-# Int63 module implementation is defined differently on
-# 32 and 64 bit platforms.
+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 $@
 	echo "(* WARNING: THIS FILE IS GENERATED FROM $< *)" | \
 	cat - $< > $@
 
+int63.mli: int63_on_$(OCAML_WORD_SIZE).mli Makefile
+	rm -f $@
+	echo "(* WARNING: THIS FILE IS GENERATED FROM $< *)" | \
+	cat - $< > $@
+
 int63.cmo: int63.cmi
 int63.cmx: int63.cmi
-int63.cmi: int63.ml
+int63.cmi: int63.ml int63.mli
 
 #test_int63.opt: int63.cmx test_int63.cmx
 #	$(OCAMLFIND) ocamlopt $^ -o $@
 
 install:
-	ocamlfind install diskimage *.mli *.cma *.cmx *.cmxa *.a
+	ocamlfind install diskimage META *.mli *.cma *.cmx *.cmxa *.a
 
 include ../Make.rules