git.annexia.org
/
virt-df.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
806e0d7
..
64c4781
100644
(file)
--- a/
lib/Makefile.in
+++ b/
lib/Makefile.in
@@
-28,19
+28,20
@@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
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 \
#----------------------------------------------------------------------
# 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 \
# 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 \
diskimage_lvm2_metadata.cmo \
diskimage_lvm2_parser.cmo \
diskimage_lvm2_lexer.cmo \
@@
-53,19
+54,20
@@
XOBJS := $(OBJS:.cmo=.cmx)
#----------------------------------------------------------------------
#----------------------------------------------------------------------
-SYNTAX := -
pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
+SYNTAX := -
syntax bitmatch.syntax
OCAMLCFLAGS := @OCAMLCFLAGS@ $(SYNTAX)
OCAMLCFLAGS := @OCAMLCFLAGS@ $(SYNTAX)
-#OCAMLCLIBS := -linkpkg
-OCAMLCLIBS := -linkpkg bitmatch.cma
+OCAMLCLIBS := -linkpkg
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTFLAGS := @OCAMLOPTFLAGS@ $(SYNTAX)
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTFLAGS := @OCAMLOPTFLAGS@ $(SYNTAX)
-#OCAMLOPTLIBS := $(OCAMLCLIBS)
-OCAMLOPTLIBS := -linkpkg bitmatch.cmxa
+OCAMLOPTLIBS := $(OCAMLCLIBS)
OCAMLDEPFLAGS := $(SYNTAX)
OCAMLDEPFLAGS := $(SYNTAX)
+OCAMLDOCFLAGS += $(SYNTAX) -I +extlib -I +bitmatch
+OCAMLDOCFILES := int63.mli diskimage.mli
+
BYTE_TARGETS := diskimage.cma
OPT_TARGETS := diskimage.cmxa
BYTE_TARGETS := diskimage.cma
OPT_TARGETS := diskimage.cmxa
@@
-88,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_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 $@
# Int63 module is defined differently on 32 and 64 bit platforms.
int63.ml: int63_on_$(OCAML_WORD_SIZE).ml Makefile
rm -f $@