X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMakefile.in;h=0ebd5b877f3c95b972d1cc495f7d030a25e11834;hb=11e0989400d8eb8be4c013ba478d8f0b6937fb4d;hp=9dae7b9e8f0de38fddd59e7c370ce16da56b9843;hpb=0b2bee9a672e5884f17ef231daf12daa89c26126;p=virt-df.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 9dae7b9..0ebd5b8 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
@@ -21,6 +22,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 +34,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 +55,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
 
@@ -83,6 +88,24 @@ 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 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.mli
+
+#test_int63.opt: int63.cmx test_int63.cmx
+#	$(OCAMLFIND) ocamlopt $^ -o $@
+
 install:
 	ocamlfind install diskimage *.mli *.cma *.cmx *.cmxa *.a