Renamed 'mark' functions to make them more consistent.

[ocaml-ancient.git] / Makefile

diff --git a/Makefile b/Makefile
index 9115302..3619f01 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Mark objects as 'ancient' so they are taken out of the OCaml heap.
-# $Id: Makefile,v 1.4 2006-09-27 14:05:07 rich Exp $
+# $Id: Makefile,v 1.6 2006-09-27 16:01:47 rich Exp $
 
 include Makefile.config
 
@@ -24,7 +24,8 @@ OCAMLOPTPACKAGES  := $(OCAMLCPACKAGES)
 OCAMLOPTLIBS   := -linkpkg weblogs.cmxa
 endif
 
-TARGETS                := ancient.cma ancient.cmxa META test_ancient.opt
+TARGETS                := mmalloc ancient.cma ancient.cmxa META \
+                  test_ancient.opt test_ancient_shared.opt
 
 ifeq ($(TEST_WEBLOGS),1)
 TARGETS                += test_ancient_weblogs.opt
@@ -33,21 +34,30 @@ endif
 all:   $(TARGETS)
 
 ancient.cma: ancient.cmo ancient_c.o
-       ocamlmklib -o ancient $^
+       ocamlmklib -o ancient -Lmmalloc -lmmalloc $^
 
 ancient.cmxa: ancient.cmx ancient_c.o
-       ocamlmklib -o ancient $^
+       ocamlmklib -o ancient -Lmmalloc -lmmalloc $^
 
 test_ancient.opt: ancient.cmxa test_ancient.cmx
        LIBRARY_PATH=.:$$LIBRARY_PATH \
        ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) -o $@ $^
 
+test_ancient_shared.opt: ancient.cmxa test_ancient_shared.cmx
+       LIBRARY_PATH=.:$$LIBRARY_PATH \
+       ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) -o $@ $^
+
 ifeq ($(TEST_WEBLOGS),1)
 test_ancient_weblogs.opt: ancient.cmxa test_ancient_weblogs.cmx
        LIBRARY_PATH=.:$$LIBRARY_PATH \
        ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) -o $@ $^
 endif
 
+# Build the mmalloc library.
+
+mmalloc:
+       $(MAKE) -C mmalloc
+
 # Common rules for building OCaml objects.
 
 .mli.cmi:
@@ -68,6 +78,7 @@ META: META.in Makefile.config
 
 clean:
        rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *~ core META *.opt
+       $(MAKE) -C mmalloc clean
 
 # Dependencies.
 
@@ -140,6 +151,6 @@ doc:
        mkdir html
        -ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d html ancient.ml{i,}
 
-.PHONY:        depend dist check-manifest dpkg doc
+.PHONY:        depend dist check-manifest dpkg doc mmalloc
 
 .SUFFIXES:     .cmo .cmi .cmx .ml .mli