modified build system and other data for threading support

This commit is contained in:
Simon Cruanes 2013-03-19 15:04:42 +01:00
parent 41274c309e
commit 579746810e
4 changed files with 16 additions and 3 deletions

View file

@ -4,3 +4,5 @@ B _build
B _build/tests B _build/tests
PKG oUnit PKG oUnit
PKG bench PKG bench
PKG threads
PKG threads.posix

View file

@ -3,13 +3,22 @@ INTERFACE_FILES = $(shell find -name '*.mli')
IMPLEMENTATION_FILES = $(shell find -name '*.ml') IMPLEMENTATION_FILES = $(shell find -name '*.ml')
TARGETS_LIB = containers.cmxa containers.cma TARGETS_LIB = containers.cmxa containers.cma
TARGET_THREAD_LIB = thread_containers.cmxa thread_containers.cma
OPTIONS = -use-ocamlfind OPTIONS = -use-ocamlfind
all: all: lib
# like lib, but with thread-specific modules
all_thread: lib lib_thread
lib:
ocamlbuild $(OPTIONS) $(TARGETS_LIB) ocamlbuild $(OPTIONS) $(TARGETS_LIB)
lib_thread:
ocamlbuild $(OPTIONS) $(TARGETS_LIB) $(TARGET_THREAD_LIB)
tests: tests:
ocamlbuild $(OPTIONS) -package oUnit -I . tests/run_tests.native ocamlbuild $(OPTIONS) -thread -package oUnit -I . tests/run_tests.native
bench: bench:
ocamlbuild $(OPTIONS) -package bench -package unix -I . tests/benchs.native ocamlbuild $(OPTIONS) -package bench -package unix -I . tests/benchs.native
@ -20,5 +29,5 @@ clean:
tags: tags:
otags *.ml *.mli otags *.ml *.mli
.PHONY: all clean tests tags .PHONY: all all_thread clean tests tags

1
_tags
View file

@ -0,0 +1 @@
<futures.*>: thread

1
thread_containers.mllib Normal file
View file

@ -0,0 +1 @@
Futures