X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2FMakefile.in;h=befbac947f9dd5f74a641b966bdc225c0a5e2ca4;hb=7ad89902cab806330bda56e283ff1c79686d68ca;hp=f303c9a80fa461c9d4f36dbecb3e49a2e9ca48f2;hpb=aa940937fcff6915ba24383d9464a10b25045a72;p=virt-df.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index f303c9a..befbac9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -21,6 +21,8 @@ VERSION		:= @PACKAGE_VERSION@
 INSTALL		:= @INSTALL@
 HAVE_PERLDOC	:= @HAVE_PERLDOC@
 
+OCAML_WORD_SIZE := @OCAML_WORD_SIZE@
+
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
@@ -31,11 +33,13 @@ OCAMLCPACKAGES	:= -package unix,extlib -I +bitmatch
 #----------------------------------------------------------------------
 # Build up the list of object files.
 
-OBJS		:= diskimage_utils.cmo
+OBJS		:= int63.cmo \
+		   diskimage_utils.cmo
 
 # Plugin objects.
 OBJS		+= diskimage_ext2.cmo \
 		   diskimage_linux_swap.cmo \
+		   diskimage_linux_swsuspend.cmo \
 		   diskimage_lvm2_metadata.cmo \
 		   diskimage_lvm2_parser.cmo \
 		   diskimage_lvm2_lexer.cmo \
@@ -50,12 +54,12 @@ XOBJS		:= $(OBJS:.cmo=.cmx)
 
 SYNTAX		:= -pp "camlp4o -I`ocamlc -where`/bitmatch pa_bitmatch.cmo"
 
-OCAMLCFLAGS	:= -g -w s $(SYNTAX)
+OCAMLCFLAGS	:= @OCAMLCFLAGS@ $(SYNTAX)
 #OCAMLCLIBS	:= -linkpkg
 OCAMLCLIBS	:= -linkpkg bitmatch.cma
 
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
-OCAMLOPTFLAGS	:= -w s $(SYNTAX)
+OCAMLOPTFLAGS	:= @OCAMLOPTFLAGS@ $(SYNTAX)
 #OCAMLOPTLIBS	:= $(OCAMLCLIBS)
 OCAMLOPTLIBS	:= -linkpkg bitmatch.cmxa
 
@@ -74,7 +78,7 @@ diskimage.cma: $(OBJS)
 
 diskimage.cmxa: $(XOBJS)
 	ocamlfind ocamlopt \
-	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
+	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) \
 	  -a -o $@ $^
 
 # 'make depend' doesn't catch these dependencies because the .mli file
@@ -83,6 +87,20 @@ 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.
+int63.ml: int63_on_$(OCAML_WORD_SIZE).ml Makefile
+	rm -f $@
+	echo "(* WARNING: THIS FILE IS GENERATED FROM $< *)" | \
+	cat - $< > $@
+
+int63.cmo: int63.cmi
+int63.cmx: int63.cmi
+int63.cmi: int63.ml
+
+#test_int63.opt: int63.cmx test_int63.cmx
+#	$(OCAMLFIND) ocamlopt $^ -o $@
+
 install:
 	ocamlfind install diskimage *.mli *.cma *.cmx *.cmxa *.a