From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Tue, 3 Jun 2008 12:07:28 +0000 (+0100)
Subject: Move libraries into subdirectory, programs into their own subdirs.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=5ce06c3326a2672e82dc656b35eb7a3e6616539a;p=virt-mem.git

Move libraries into subdirectory, programs into their own subdirs.
---

diff --git a/.depend b/.depend
deleted file mode 100644
index 5f4eb15..0000000
--- a/.depend
+++ /dev/null
@@ -1,5 +0,0 @@
-virt_mem_mmap.cmi: virt_mem_utils.cmo 
-virt_mem.cmo: virt_mem_utils.cmo virt_mem_mmap.cmi 
-virt_mem.cmx: virt_mem_utils.cmx virt_mem_mmap.cmx 
-virt_mem_mmap.cmo: virt_mem_utils.cmo virt_mem_mmap.cmi 
-virt_mem_mmap.cmx: virt_mem_utils.cmx virt_mem_mmap.cmi 
diff --git a/.hgignore b/.hgignore
index 4384d4e..5512c6b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,6 @@
 syntax:glob
 Makefile
+Make.rules
 *~
 *.opt
 *.annot
@@ -7,6 +8,9 @@ Makefile
 *.cmo
 *.cmx
 *.o
+*.a
+*.cma
+*.cmxa
 autom4te.cache
 config.h
 config.h.in
@@ -14,5 +18,4 @@ config.log
 config.status
 configure
 gmon.out
-virt-mem
-virt_mem_gettext.ml
+lib/virt_mem_gettext.ml
diff --git a/Make.rules.in b/Make.rules.in
new file mode 100644
index 0000000..0ce95e2
--- /dev/null
+++ b/Make.rules.in
@@ -0,0 +1,68 @@
+# virt-mem -*- Makefile -*-
+# @configure_input@
+# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+# This file is included by Makefiles in subdirectories.
+
+OCAMLFIND	= @OCAMLFIND@
+OCAMLDEP	= @OCAMLDEP@
+OCAMLC		= @OCAMLC@
+OCAMLOPT	= @OCAMLOPT@
+
+OCAMLDOC        = @OCAMLDOC@
+OCAMLDOCFLAGS	+= -html -sort
+
+# Common rules for building OCaml objects.
+
+.mli.cmi:
+	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -c $<
+.ml.cmo:
+	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -c $<
+.ml.cmx:
+	$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -c $<
+
+%.ml %.mli: %.mly
+	ocamlyacc $<
+.mll.ml:
+	ocamllex $<
+
+# Dependencies.
+
+depend: .depend
+
+.depend: $(wildcard *.mli) $(wildcard *.ml)
+	rm -f .depend
+	$(OCAMLFIND) ocamldep $(OCAMLCPACKAGES) $(OCAMLDEPFLAGS) $^ > $@
+
+ifeq ($(wildcard .depend),.depend)
+include .depend
+endif
+
+# Developer documentation (in html/ subdirectory).
+
+ifneq ($(OCAMLDOC),)
+ifneq ($(OCAMLDOCFILES),)
+doc:
+	rm -rf html
+	mkdir html
+	-$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $(OCAMLDOCFILES)
+endif
+endif
+
+.PHONY: depend dist check-manifest dpkg doc
+
+.SUFFIXES:      .cmo .cmi .cmx .ml .mli .mll .mly
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..faaf202
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,75 @@
+# virt-mem
+# @configure_input@
+# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+PACKAGE		= @PACKAGE_NAME@
+VERSION		= @PACKAGE_VERSION@
+
+INSTALL		= @INSTALL@
+
+SUBDIRS		= lib uname dmesg
+
+all install:
+	for d in $(SUBDIRS) po; do \
+	  $(MAKE) -C $$d $@; \
+	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	done
+
+depend doc:
+	for d in $(SUBDIRS); do \
+	  $(MAKE) -C $$d $@; \
+	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	done
+
+clean:
+	for d in . $(SUBDIRS); do \
+	  (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a \
+	    *.so *.opt *~ *.dll *.exe *.annot core); \
+	done
+	for d in po; do \
+	  (cd $$d; rm -f *~); \
+	done
+	rm -f uname/virt-uname
+	rm -f dmesg/virt-dmesg
+
+distclean: clean
+	rm -f config.h config.log config.status configure
+	rm -rf autom4te.cache
+	rm -f Makefile
+	rm -f virt-df/Makefile
+
+# Distribution.
+
+dist:
+	$(MAKE) check-manifest
+	rm -rf $(PACKAGE)-$(VERSION)
+	mkdir $(PACKAGE)-$(VERSION)
+	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
+	$(INSTALL) -m 0755 configure $(PACKAGE)-$(VERSION)/
+	tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
+	rm -rf $(PACKAGE)-$(VERSION)
+	ls -l $(PACKAGE)-$(VERSION).tar.gz
+
+check-manifest:
+	hg manifest | sort > .check-manifest; \
+	sort MANIFEST > .orig-manifest; \
+	diff -u .orig-manifest .check-manifest; rv=$$?; \
+	rm -f .orig-manifest .check-manifest; \
+	exit $$rv
+
+.PHONY: all opt depend install clean distclean configure dist check-manifest \
+	release release_stage_2 release_stage_3 force
\ No newline at end of file
diff --git a/README b/README
index 9e188cb..170a8b6 100644
--- a/README
+++ b/README
@@ -43,12 +43,11 @@ Run ./configure and look at the output for any missing packages.
 Then:
 
   make
-  make -C po     # if you want to rebuild the message catalogs
 
 The binaries are called things like 'virt-dmesg.opt' and located in
 the respective directories, so you could run them by doing:
 
-  dmesg/virt-dmesg.opt
+  ./dmesg/virt-dmesg.opt
 
 All the binaries understand the --help option to provide a summary of
 options.  All require virtual machines to run against, but most also
@@ -58,4 +57,3 @@ To install the binaries, man pages and message catalogs, do this as
 root:
 
   make install
-  make -C po install
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index c1475e9..9af88f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,12 +79,12 @@ dnl Write gettext modules for the programs.
 dnl http://www.le-gall.net/sylvain+violaine/documentation/ocaml-gettext/html/reference-manual/ch03s04.html
 for d in virt-mem; do
     f=`echo $d | tr - _`_gettext.ml
-    AC_MSG_NOTICE([creating $f])
-    rm -f $f
-    echo "(* This file is generated automatically by ./configure. *)" > $f
+    AC_MSG_NOTICE([creating lib/$f])
+    rm -f lib/$f
+    echo "(* This file is generated automatically by ./configure. *)" > lib/$f
     if test "x$pkg_gettext" != "xno"; then
         # Gettext module is available, so use it.
-        cat <<EOT >>$f
+        cat <<EOT >>lib/$f
 module Gettext = Gettext.Program (
   struct
     let textdomain = "$d"
@@ -96,7 +96,7 @@ module Gettext = Gettext.Program (
 EOT
     else
         # No gettext module is available, so fake the translation functions.
-        cat <<EOT >>$f
+        cat <<EOT >>lib/$f
 module Gettext = struct
   external s_ : string -> string = "%identity"
   external f_ : ('a -> 'b, 'c, 'd) format -> ('a -> 'b, 'c, 'd) format
@@ -133,6 +133,10 @@ echo "------------------------------------------------------------"
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile
+	Make.rules
+	lib/Makefile
+	uname/Makefile
+	dmesg/Makefile
 	po/Makefile
 	])
 AC_OUTPUT
diff --git a/dmesg/.depend b/dmesg/.depend
new file mode 100644
index 0000000..e69de29
diff --git a/dmesg/Makefile.in b/dmesg/Makefile.in
index dd8374c..1740e00 100644
--- a/dmesg/Makefile.in
+++ b/dmesg/Makefile.in
@@ -37,81 +37,20 @@ OCAMLOPTFLAGS	= @OCAMLOPTFLAGS@ $(SYNTAX)
 OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
 OCAMLOPTLIBS	= -linkpkg bitmatch.cmxa
 
-OCAMLDOCFLAGS	= -html -stars -sort $(OCAMLCPACKAGES) $(SYNTAX)
+OCAMLDOCFLAGS	= -html -sort $(OCAMLCPACKAGES) $(SYNTAX)
 
-TARGETS		= virt-mem virt-mem.opt
+OCAMLDEPFLAGS	= $(SYNTAX)
 
-OBJS		= virt_mem_gettext.cmo \
-		  virt_mem_utils.cmo \
-		  virt_mem_mmap.cmo \
-		  virt_mem.cmo
-XOBJS		= virt_mem_gettext.cmx \
-		  virt_mem_utils.cmx \
-		  virt_mem_mmap.cmx \
-		  virt_mem.cmx
+TARGETS		= 
 
 all:	$(TARGETS)
 
-virt-mem: $(OBJS)
-	ocamlfind ocamlc \
-	  $(OCAMLCFLAGS) $(OCAMLCPACKAGES) $(OCAMLCLIBS) $^ -o $@
-
-virt-mem.opt: $(XOBJS)
-	ocamlfind ocamlopt \
-	  $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) $^ -o $@
-
-# Common rules for building OCaml objects.
-
-.mli.cmi:
-	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -c $<
-.ml.cmo:
-	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -c $<
-.ml.cmx:
-	ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -c $<
-
-clean:
-	rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a \
-	    *.so *.opt *~ *.dll *.exe *.annot core
-
-# Distribution.
-
-dist:
-	$(MAKE) check-manifest
-	rm -rf $(PACKAGE)-$(VERSION)
-	mkdir $(PACKAGE)-$(VERSION)
-	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
-	$(INSTALL) -m 0755 configure $(PACKAGE)-$(VERSION)/
-	tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
-	rm -rf $(PACKAGE)-$(VERSION)
-	ls -l $(PACKAGE)-$(VERSION).tar.gz
-
-check-manifest:
-	hg manifest | sort > .check-manifest; \
-	sort MANIFEST > .orig-manifest; \
-	diff -u .orig-manifest .check-manifest; rv=$$?; \
-	rm -f .orig-manifest .check-manifest; \
-	exit $$rv
-
-# Developer documentation (in html/ subdirectory).
-
-doc:
-	rm -rf html
-	mkdir html
-	-ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html *.{ml,mli}
-
-# Dependencies.
-
-depend: .depend
-
-.depend: $(wildcard *.mli) $(wildcard *.ml)
-	rm -f .depend
-	ocamldep $(SYNTAX) $^ > $@
-
-ifeq ($(wildcard .depend),.depend)
-include .depend
-endif
-
-.PHONY: all opt depend install clean distclean configure dist check-manifest \
-	release release_stage_2 release_stage_3 force
+#virt-mem: $(OBJS)
+#	ocamlfind ocamlc \
+#	  $(OCAMLCFLAGS) $(OCAMLCPACKAGES) $(OCAMLCLIBS) $^ -o $@
+#
+#virt-mem.opt: $(XOBJS)
+#	ocamlfind ocamlopt \
+#	  $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) $^ -o $@
 
-.SUFFIXES:	.cmo .cmi .cmx .ml .mli
+include ../Make.rules
\ No newline at end of file
diff --git a/lib/.depend b/lib/.depend
new file mode 100644
index 0000000..8b11723
--- /dev/null
+++ b/lib/.depend
@@ -0,0 +1,11 @@
+virt_mem_mmap.cmi: virt_mem_utils.cmo /usr/lib64/ocaml/bitmatch/bitmatch.cmi 
+virt_mem.cmo: virt_mem_utils.cmo virt_mem_mmap.cmi \
+    /usr/lib64/ocaml/bitmatch/bitmatch.cmi 
+virt_mem.cmx: virt_mem_utils.cmx virt_mem_mmap.cmx \
+    /usr/lib64/ocaml/bitmatch/bitmatch.cmi 
+virt_mem_mmap.cmo: virt_mem_utils.cmo /usr/lib64/ocaml/bitmatch/bitmatch.cmi \
+    virt_mem_mmap.cmi 
+virt_mem_mmap.cmx: virt_mem_utils.cmx /usr/lib64/ocaml/bitmatch/bitmatch.cmi \
+    virt_mem_mmap.cmi 
+virt_mem_utils.cmo: /usr/lib64/ocaml/bitmatch/bitmatch.cmi 
+virt_mem_utils.cmx: /usr/lib64/ocaml/bitmatch/bitmatch.cmi 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index dd8374c..0af4ae7 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -21,7 +21,7 @@ VERSION		= @PACKAGE_VERSION@
 
 INSTALL		= @INSTALL@
 
-SYNTAX		= -pp "camlp4o -I`ocamlc -where`/bitmatch bitmatch.cma pa_bitmatch.cmo"
+SYNTAX		= -pp "camlp4o -I$$(ocamlc -where)/bitmatch bitmatch.cma pa_bitmatch.cmo"
 
 #OCAMLCPACKAGES	= -package unix,bigarray,extlib,bitmatch
 OCAMLCPACKAGES	= -package unix,bigarray,extlib -I +bitmatch
@@ -37,9 +37,11 @@ OCAMLOPTFLAGS	= @OCAMLOPTFLAGS@ $(SYNTAX)
 OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
 OCAMLOPTLIBS	= -linkpkg bitmatch.cmxa
 
-OCAMLDOCFLAGS	= -html -stars -sort $(OCAMLCPACKAGES) $(SYNTAX)
+OCAMLDOCFLAGS	= -html -sort $(OCAMLCPACKAGES) $(SYNTAX)
 
-TARGETS		= virt-mem virt-mem.opt
+OCAMLDEPFLAGS	= $(SYNTAX)
+
+TARGETS		= virt_mem.cma virt_mem.cmxa
 
 OBJS		= virt_mem_gettext.cmo \
 		  virt_mem_utils.cmo \
@@ -52,66 +54,10 @@ XOBJS		= virt_mem_gettext.cmx \
 
 all:	$(TARGETS)
 
-virt-mem: $(OBJS)
-	ocamlfind ocamlc \
-	  $(OCAMLCFLAGS) $(OCAMLCPACKAGES) $(OCAMLCLIBS) $^ -o $@
-
-virt-mem.opt: $(XOBJS)
-	ocamlfind ocamlopt \
-	  $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) $^ -o $@
-
-# Common rules for building OCaml objects.
-
-.mli.cmi:
-	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -c $<
-.ml.cmo:
-	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -c $<
-.ml.cmx:
-	ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -c $<
-
-clean:
-	rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a \
-	    *.so *.opt *~ *.dll *.exe *.annot core
-
-# Distribution.
-
-dist:
-	$(MAKE) check-manifest
-	rm -rf $(PACKAGE)-$(VERSION)
-	mkdir $(PACKAGE)-$(VERSION)
-	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
-	$(INSTALL) -m 0755 configure $(PACKAGE)-$(VERSION)/
-	tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
-	rm -rf $(PACKAGE)-$(VERSION)
-	ls -l $(PACKAGE)-$(VERSION).tar.gz
-
-check-manifest:
-	hg manifest | sort > .check-manifest; \
-	sort MANIFEST > .orig-manifest; \
-	diff -u .orig-manifest .check-manifest; rv=$$?; \
-	rm -f .orig-manifest .check-manifest; \
-	exit $$rv
-
-# Developer documentation (in html/ subdirectory).
-
-doc:
-	rm -rf html
-	mkdir html
-	-ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html *.{ml,mli}
-
-# Dependencies.
-
-depend: .depend
-
-.depend: $(wildcard *.mli) $(wildcard *.ml)
-	rm -f .depend
-	ocamldep $(SYNTAX) $^ > $@
-
-ifeq ($(wildcard .depend),.depend)
-include .depend
-endif
+virt_mem.cma: $(OBJS)
+	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -a -o $@ $^
 
-.PHONY: all opt depend install clean distclean configure dist check-manifest \
-	release release_stage_2 release_stage_3 force
+virt_mem.cmxa: $(XOBJS)
+	ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -a -o $@ $^
 
-.SUFFIXES:	.cmo .cmi .cmx .ml .mli
+include ../Make.rules
\ No newline at end of file
diff --git a/virt_mem.ml b/lib/virt_mem.ml
similarity index 100%
rename from virt_mem.ml
rename to lib/virt_mem.ml
diff --git a/virt_mem_mmap.ml b/lib/virt_mem_mmap.ml
similarity index 100%
rename from virt_mem_mmap.ml
rename to lib/virt_mem_mmap.ml
diff --git a/virt_mem_mmap.mli b/lib/virt_mem_mmap.mli
similarity index 100%
rename from virt_mem_mmap.mli
rename to lib/virt_mem_mmap.mli
diff --git a/virt_mem_utils.ml b/lib/virt_mem_utils.ml
similarity index 100%
rename from virt_mem_utils.ml
rename to lib/virt_mem_utils.ml
diff --git a/po/Makefile.in b/po/Makefile.in
index 215884c..8a6ef41 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-OCAML_GETTEXT_PACKAGE = virt-df
+OCAML_GETTEXT_PACKAGE = virt-mem
 LINGUAS		= $(shell cat LINGUAS)
 SOURCES		= POTFILES
 
diff --git a/uname/.depend b/uname/.depend
new file mode 100644
index 0000000..e69de29
diff --git a/uname/Makefile.in b/uname/Makefile.in
index dd8374c..1740e00 100644
--- a/uname/Makefile.in
+++ b/uname/Makefile.in
@@ -37,81 +37,20 @@ OCAMLOPTFLAGS	= @OCAMLOPTFLAGS@ $(SYNTAX)
 OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
 OCAMLOPTLIBS	= -linkpkg bitmatch.cmxa
 
-OCAMLDOCFLAGS	= -html -stars -sort $(OCAMLCPACKAGES) $(SYNTAX)
+OCAMLDOCFLAGS	= -html -sort $(OCAMLCPACKAGES) $(SYNTAX)
 
-TARGETS		= virt-mem virt-mem.opt
+OCAMLDEPFLAGS	= $(SYNTAX)
 
-OBJS		= virt_mem_gettext.cmo \
-		  virt_mem_utils.cmo \
-		  virt_mem_mmap.cmo \
-		  virt_mem.cmo
-XOBJS		= virt_mem_gettext.cmx \
-		  virt_mem_utils.cmx \
-		  virt_mem_mmap.cmx \
-		  virt_mem.cmx
+TARGETS		= 
 
 all:	$(TARGETS)
 
-virt-mem: $(OBJS)
-	ocamlfind ocamlc \
-	  $(OCAMLCFLAGS) $(OCAMLCPACKAGES) $(OCAMLCLIBS) $^ -o $@
-
-virt-mem.opt: $(XOBJS)
-	ocamlfind ocamlopt \
-	  $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) $^ -o $@
-
-# Common rules for building OCaml objects.
-
-.mli.cmi:
-	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -c $<
-.ml.cmo:
-	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) -c $<
-.ml.cmx:
-	ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) -c $<
-
-clean:
-	rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a \
-	    *.so *.opt *~ *.dll *.exe *.annot core
-
-# Distribution.
-
-dist:
-	$(MAKE) check-manifest
-	rm -rf $(PACKAGE)-$(VERSION)
-	mkdir $(PACKAGE)-$(VERSION)
-	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
-	$(INSTALL) -m 0755 configure $(PACKAGE)-$(VERSION)/
-	tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
-	rm -rf $(PACKAGE)-$(VERSION)
-	ls -l $(PACKAGE)-$(VERSION).tar.gz
-
-check-manifest:
-	hg manifest | sort > .check-manifest; \
-	sort MANIFEST > .orig-manifest; \
-	diff -u .orig-manifest .check-manifest; rv=$$?; \
-	rm -f .orig-manifest .check-manifest; \
-	exit $$rv
-
-# Developer documentation (in html/ subdirectory).
-
-doc:
-	rm -rf html
-	mkdir html
-	-ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html *.{ml,mli}
-
-# Dependencies.
-
-depend: .depend
-
-.depend: $(wildcard *.mli) $(wildcard *.ml)
-	rm -f .depend
-	ocamldep $(SYNTAX) $^ > $@
-
-ifeq ($(wildcard .depend),.depend)
-include .depend
-endif
-
-.PHONY: all opt depend install clean distclean configure dist check-manifest \
-	release release_stage_2 release_stage_3 force
+#virt-mem: $(OBJS)
+#	ocamlfind ocamlc \
+#	  $(OCAMLCFLAGS) $(OCAMLCPACKAGES) $(OCAMLCLIBS) $^ -o $@
+#
+#virt-mem.opt: $(XOBJS)
+#	ocamlfind ocamlopt \
+#	  $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) $^ -o $@
 
-.SUFFIXES:	.cmo .cmi .cmx .ml .mli
+include ../Make.rules
\ No newline at end of file