X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=538aee3b37c3e53ef133024ea6912859d0eeb313;hb=65cb807751c21e0befcfd89c1b605675dc280395;hp=f029f4364118ce74e48b06b346c6ca17ef377d67;hpb=817742e3a1d5fc8b02d2140a3c74e695ade71434;p=ocaml-ancient.git

diff --git a/Makefile b/Makefile
index f029f43..538aee3 100644
--- 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.5 2006-09-27 15:36:18 rich Exp $
+# $Id: Makefile,v 1.7 2006-10-06 12:26:31 rich Exp $
 
 include Makefile.config
 
@@ -16,19 +16,8 @@ OCAMLOPTLIBS	:=
 
 OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCPACKAGES)
 
-ifeq ($(TEST_WEBLOGS),1)
-# For testing with large amount of weblogs data.
-OCAMLCPACKAGES	:= -package calendar,pcre,extlib -I ../../freeware/weblogs
-OCAMLCLIBS	:= -linkpkg weblogs.cma
-OCAMLOPTPACKAGES  := $(OCAMLCPACKAGES)
-OCAMLOPTLIBS	:= -linkpkg weblogs.cmxa
-endif
-
-TARGETS		:= mmalloc ancient.cma ancient.cmxa META test_ancient.opt
-
-ifeq ($(TEST_WEBLOGS),1)
-TARGETS		+= test_ancient_weblogs.opt
-endif
+TARGETS		:= mmalloc ancient.cma ancient.cmxa META \
+		   test_ancient.opt test_ancient_shared.opt
 
 all:	$(TARGETS)
 
@@ -42,11 +31,9 @@ test_ancient.opt: ancient.cmxa test_ancient.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
+test_ancient_shared.opt: ancient.cmxa test_ancient_shared.cmx
 	LIBRARY_PATH=.:$$LIBRARY_PATH \
 	ocamlfind ocamlopt $(OCAMLOPTFLAGS) $(OCAMLOPTPACKAGES) $(OCAMLOPTLIBS) -o $@ $^
-endif
 
 # Build the mmalloc library.
 
@@ -91,7 +78,7 @@ endif
 
 install:
 	rm -rf $(DESTDIR)$(OCAMLLIBDIR)/ancient
-	install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/weblogs
+	install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/ancient
 	install -c -m 0644 *.cmi *.mli *.cma *.cmxa *.a META \
 	  $(DESTDIR)$(OCAMLLIBDIR)/ancient