X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2FMakefile.in;h=21ccfde0f6215d9d2713ee243b313aefe4bf840f;hb=8eb1c2c4f71819108ceea4731f4dad75775ce6ae;hp=1a20d23a28463567d73c45405a3a4c4344d2af1f;hpb=6718047aff504b3261229dd648b1a4c00ca9ab21;p=virt-mem.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1a20d23..21ccfde 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -21,21 +21,25 @@ VERSION		= @PACKAGE_VERSION@
 
 INSTALL		= @INSTALL@
 
-SYNTAX		= -pp "camlp4o -I$$(ocamlc -where)/bitmatch bitmatch.cma pa_bitmatch.cmo"
+OCAMLLIB	= @OCAMLLIB@
 
-#OCAMLCPACKAGES	= -package unix,bigarray,extlib,libvirt,xml-light,bitmatch
-OCAMLCPACKAGES	= -package unix,bigarray,extlib,libvirt,xml-light -I +bitmatch
+CC		= @CC@
+CFLAGS		= @CFLAGS@ -Wall -Werror -I$(OCAMLLIB) -I@top_srcdir@
+
+SYNTAX		= -syntax bitstring.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
+OCAMLOPTLIBS	= -linkpkg
 
 OCAMLDOCFLAGS	= -html -sort $(OCAMLCPACKAGES) $(SYNTAX)
 
@@ -44,20 +48,22 @@ OCAMLDEPFLAGS	= $(SYNTAX)
 TARGETS		= virt_mem.cma virt_mem.cmxa
 
 OBJS		= virt_mem_gettext.cmo \
+		  virt_mem_version.cmo \
 		  virt_mem_utils.cmo \
+		  virt_mem_mmap_c.o \
 		  virt_mem_mmap.cmo \
-		  virt_mem.cmo
-XOBJS		= virt_mem_gettext.cmx \
-		  virt_mem_utils.cmx \
-		  virt_mem_mmap.cmx \
-		  virt_mem.cmx
+		  virt_mem.cmo \
+		  virt_mem_capture.cmo
+XOBJS		= $(OBJS:%.cmo=%.cmx)
 
 all:	$(TARGETS)
 
 virt_mem.cma: $(OBJS)
-	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -a -o $@ $^
+	ocamlmklib -o virt_mem $^
 
 virt_mem.cmxa: $(XOBJS)
-	ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -a -o $@ $^
+	ocamlmklib -o virt_mem $^
+
+install:
 
 include ../Make.rules
\ No newline at end of file