X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ps%2FMakefile.in;h=2620b772d74228ae0475fa6bde5bc20f033977cb;hb=df3b931012515e3f0e7b741d000f4930dbea0a79;hp=b9de26b881ff7593b2b6161450e756e0342d96c2;hpb=8a8c035f78a41d68ba62bb35a6fba503481324e2;p=virt-mem.git

diff --git a/ps/Makefile.in b/ps/Makefile.in
index b9de26b..2620b77 100644
--- a/ps/Makefile.in
+++ b/ps/Makefile.in
@@ -23,45 +23,32 @@ INSTALL		= @INSTALL@
 MKDIR_P		= @MKDIR_P@
 bindir		= @bindir@
 
-SYNTAX		= -pp "camlp4o -I$$(ocamlc -where)/bitmatch bitmatch.cma pa_bitmatch.cmo"
+SYNTAX		= -syntax bitstring.syntax
 
-#OCAMLCPACKAGES	= -package unix,bigarray,extlib,libvirt,xml-light,bitmatch
-OCAMLCPACKAGES	= -package unix,bigarray,extlib,libvirt,xml-light -I +bitmatch -I ../lib
+OCAMLCPACKAGES	= -package unix,bigarray,extlib,libvirt,xml-light,bitstring.syntax -I ../lib
 
 ifneq ($(pkg_gettext),no)
 OCAMLCPACKAGES	+= -package gettext-stub
 endif
 
 OCAMLCFLAGS	= @OCAMLCFLAGS@ $(SYNTAX)
-OCAMLCLIBS	= -linkpkg bitmatch.cma ../lib/virt_mem.cma
+OCAMLCLIBS	= -linkpkg ../lib/virt_mem.cma
 
 OCAMLOPTFLAGS	= @OCAMLOPTFLAGS@ $(SYNTAX)
 OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
-OCAMLOPTLIBS	= -linkpkg bitmatch.cmxa ../lib/virt_mem.cmxa
+OCAMLOPTLIBS	= -linkpkg ../lib/virt_mem.cmxa
 
 OCAMLDOCFLAGS	= -html -sort $(OCAMLCPACKAGES) $(SYNTAX)
 
 OCAMLDEPFLAGS	= $(SYNTAX)
 
-TARGETS		= virt-ps virt-ps.opt
-
 OBJS		= virt_ps.cmo
 XOBJS		= virt_ps.cmx
 
-all:	$(TARGETS)
-
-virt-ps: $(OBJS) ../lib/virt_mem.cma
-	ocamlfind ocamlc \
-	  $(OCAMLCFLAGS) $(OCAMLCPACKAGES) $(OCAMLCLIBS) $(OBJS) -o $@
+TARGETS		= $(OBJS) $(XOBJS)
 
-virt-ps.opt: $(XOBJS) ../lib/virt_mem.cmxa
-	ocamlfind ocamlopt \
-	  $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) $(XOBJS) -o $@
+all:	$(TARGETS)
 
 install:
-	if [ -x virt-ps.opt ]; then \
-	  $(MKDIR_P) $(DESTDIR)$(bindir); \
-	  $(INSTALL) -m 0755 virt-ps.opt $(DESTDIR)$(bindir)/virt-ps; \
-	fi
 
 include ../Make.rules
\ No newline at end of file