X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMakefile.in;h=0a757e828e20a51fb68f16742ca0f09bb941263f;hb=35f68724b76ea85e9b949f05ad82b82a7144989c;hp=bc3cce8900dcc1d404ce789dfc701179c5ec5812;hpb=8bd81b64dd11b27840b53208db19432dc9f6e06b;p=virt-mem.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index bc3cce8..0a757e8 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -21,10 +21,14 @@ 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 bitmatch.syntax
+
+OCAMLCPACKAGES	= -package unix,bigarray,extlib,libvirt,xml-light,bitmatch.syntax
 
 ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES	+= -package gettext-stub
@@ -44,21 +48,20 @@ 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
+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: