X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMakefile.in;h=e96a54245662733eb2bcc95ff2079c741aa25875;hb=fa333da9b9d5338cb18c0077ba10dffd2cc4d464;hp=373e452a6a65d62f7cec4107e3d5b60c7462bcc7;hpb=97131d94f5513b732f8f8d310984e71d8201cadf;p=virt-mem.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 373e452..e96a542 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -23,25 +23,25 @@ INSTALL		= @INSTALL@
 
 OCAMLLIB	= @OCAMLLIB@
 
+pkg_gettext	= @pkg_gettext@
+
 CC		= @CC@
-CFLAGS		= @CFLAGS@ -Wall -Werror -I$(OCAMLLIB) -I@top_srcdir@
+CFLAGS		= @CFLAGS@ -fPIC -Wall -Werror -I$(OCAMLLIB) -I@top_srcdir@
 
-SYNTAX		= -syntax bitmatch.syntax
+SYNTAX		= -syntax bitstring.syntax
 
-OCAMLCPACKAGES	= -package unix,bigarray,extlib,libvirt,xml-light,bitmatch.syntax
+OCAMLCPACKAGES	= -package unix,bigarray,extlib,libvirt,xml-light,bitstring.syntax
 
 ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES	+= -package gettext-stub
 endif
 
 OCAMLCFLAGS	= @OCAMLCFLAGS@ $(SYNTAX)
-OCAMLCLIBS	= -linkpkg bitmatch.cma
+OCAMLCLIBS	= -linkpkg
 
 OCAMLOPTFLAGS	= @OCAMLOPTFLAGS@ $(SYNTAX)
 OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
-OCAMLOPTLIBS	= -linkpkg bitmatch.cmxa
-
-OCAMLDOCFLAGS	= -html -sort $(OCAMLCPACKAGES) $(SYNTAX)
+OCAMLOPTLIBS	= -linkpkg
 
 OCAMLDEPFLAGS	= $(SYNTAX)
 
@@ -49,11 +49,23 @@ TARGETS		= virt_mem.cma virt_mem.cmxa
 
 OBJS		= virt_mem_gettext.cmo \
 		  virt_mem_version.cmo \
+		  virt_mem_kernels.cmo \
 		  virt_mem_utils.cmo \
 		  virt_mem_mmap_c.o \
 		  virt_mem_mmap.cmo \
+		  virt_mem_types.cmo \
+		  virt_mem_list_head.cmo \
+		  kernel.cmo \
+		  virt_mem_ksyms.cmo \
+		  virt_mem_kallsyms.cmo \
+		  virt_mem_utsname.cmo \
 		  virt_mem.cmo \
-		  virt_mem_capture.cmo
+		  virt_mem_capture.cmo \
+		  virt_mem_dump.cmo
+
+#		  virt_mem_tasks.cmo
+#		  virt_mem_net_devices.cmo
+
 XOBJS		= $(OBJS:%.cmo=%.cmx)
 
 all:	$(TARGETS)
@@ -64,6 +76,19 @@ virt_mem.cma: $(OBJS)
 virt_mem.cmxa: $(XOBJS)
 	ocamlmklib -o virt_mem $^
 
+# The autogenerated code in kernel.ml contains recursive types.
+kernel.cmo: kernel.ml
+	$(OCAMLFIND) ocamlc -rectypes $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -c $<
+
+kernel.cmx: kernel.ml
+	$(OCAMLFIND) ocamlopt -rectypes $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -c $<
+
+# Just for testing Virt_mem_mmap module:
+test_mmap: virt_mem_utils.cmx virt_mem_mmap_c.o virt_mem_mmap.cmx test_mmap.cmx
+	ocamlfind ocamlopt \
+	  $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) \
+	  bitstring.cmxa -o $@ $^
+
 install:
 
 include ../Make.rules
\ No newline at end of file