- split threaded and non threaded implementations

[helm.git] / helm / DEVEL / ocaml-http / Makefile

diff --git a/helm/DEVEL/ocaml-http/Makefile b/helm/DEVEL/ocaml-http/Makefile
index 473b6b8f2cff0cfa71991fe8c44af531df392d2a..6c9b44ce83d605b56f65f0ac984c3264b620ab29 100644 (file)
--- a/helm/DEVEL/ocaml-http/Makefile
+++ b/helm/DEVEL/ocaml-http/Makefile
@@ -1,11 +1,21 @@
 include Makefile.defs
 
-MODULES = common misc types request daemon response
+MODULES = http_common http_misc http_types http_request http_parser http_tcp_server http_daemon http_response
+THREADED_SRV = http_threaded_tcp_server
+MODULES_MT = $(patsubst http_tcp_server, mt/$(THREADED_SRV) http_tcp_server, $(MODULES))
+MODULES_NON_MT = $(patsubst http_tcp_server, non_mt/$(THREADED_SRV) http_tcp_server, $(MODULES))
+PUBLIC_MODULES = http_common http_types http_request http_daemon http_response
 DESTDIR = $(shell $(OCAMLFIND) printconf stdlib) 
 
-all: http.cmo
-opt: http.cmx
+all: all_non_mt all_mt
+opt: opt_non_mt opt_mt
+all_non_mt: http.cma
+opt_non_mt: http.cmxa
+all_mt: http_mt.cma
+opt_mt: http_mt.cmxa
 world: all opt
+doc: *.mli
+       $(OCAMLDOC) -html -d doc/html *.mli
 
 examples:
        $(MAKE) -C examples/
@@ -24,10 +34,28 @@ depend:
 %.cmx: %.ml %.cmi
        $(OCAMLOPT) -c $<
 
-http.cmo: $(patsubst %,%.cmo,$(MODULES))
-       ocamlc -pack -o $@ $^
-http.cmx: $(patsubst %,%.cmx,$(MODULES))
-       ocamlopt -pack -o $@ $^
+non_mt/$(THREADED_SRV).cmo: non_mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi
+       cp $(THREADED_SRV).{cmi,mli} non_mt/
+       $(OCAMLC) -c $<
+non_mt/$(THREADED_SRV).cmx: non_mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi
+       cp $(THREADED_SRV).{cmi,mli} non_mt/
+       $(OCAMLOPT) -c $<
+
+mt/$(THREADED_SRV).cmo: mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi
+       cp $(THREADED_SRV).{cmi,mli} mt/
+       $(OCAMLC) $(THREADS_FLAGS) -c $<
+mt/$(THREADED_SRV).cmx: mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi
+       cp $(THREADED_SRV).{cmi,mli} mt/
+       $(OCAMLOPT) $(THREADS_FLAGS) -c $<
+
+http.cma: $(patsubst %,%.cmo,$(MODULES_NON_MT))
+       $(OCAMLC) -a -o $@ $^
+http.cmxa: $(patsubst %,%.cmx,$(MODULES_NON_MT))
+       $(OCAMLOPT) -a -o $@ $^
+http_mt.cma: $(patsubst %,%.cmo,$(MODULES_MT))
+       $(OCAMLC) -a -o $@ $^
+http_mt.cmxa: $(patsubst %,%.cmx,$(MODULES_MT))
+       $(OCAMLOPT) -a -o $@ $^
 
 meta: META
 META: META.in
@@ -35,8 +63,13 @@ META: META.in
 
 clean:
        $(MAKE) -C examples/ clean
-       -rm -f *.cm[ioax] *.o test{,.opt}
-distclean: clean
+       for d in . mt non_mt; do        \
+               rm -f $$d/*.cm[ioax] $$d/*.cmxa $$d/*.[ao] $$d/test{,.opt};     \
+       done
+       rm -f {mt,non_mt}/$(THREADED_SRV).mli
+docclean:
+       rm -f doc/html/*.html doc/html/*.css
+distclean: clean docclean
        $(MAKE) -C examples/ distclean
        -rm -f META
 dist: distclean depend
@@ -50,9 +83,11 @@ dist: distclean depend
        tar cvzf $(DISTDIR).tar.gz $(DISTDIR)/
        rm -rf $(DISTDIR)/
 install: META
-       $(OCAMLFIND) install -destdir $(DESTDIR) $(PKGNAME) META *.mli http.*
+       $(OCAMLFIND) install -destdir $(DESTDIR) $(PKGNAME)     \
+               META $(patsubst %,%.mli,$(PUBLIC_MODULES))      \
+               $(patsubst %,%.cmi,$(PUBLIC_MODULES)) http.cm{,x}a http.a
 
 .PHONY:        \
        all opt world examples examples.opt depend clean distclean dist \
-       install meta
+       install meta doc