no longer use -pack and Http.*, now interface is the usual Http_*

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

diff --git a/helm/DEVEL/ocaml-http/Makefile b/helm/DEVEL/ocaml-http/Makefile
index 950c72035b2ec9d547fb7c3a9ba7ce996b5c2ceb..4f4def3fefee3e595a6a648bd9fd14e93ad7a2d1 100644 (file)
--- a/helm/DEVEL/ocaml-http/Makefile
+++ b/helm/DEVEL/ocaml-http/Makefile
@@ -1,6 +1,7 @@
 include Makefile.defs
 
-MODULES = common misc types request daemon response
+MODULES = http_common http_misc http_types http_request http_daemon http_response
+PUBLIC_MODULES = http_common http_types http_request http_daemon http_response
 DESTDIR = $(shell $(OCAMLFIND) printconf stdlib) 
 
 all: http.cma
@@ -24,14 +25,10 @@ depend:
 %.cmx: %.ml %.cmi
        $(OCAMLOPT) -c $<
 
-http.cmo: $(patsubst %,%.cmo,$(MODULES))
-       ocamlc -pack -o $@ $^
-http.cmx: $(patsubst %,%.cmx,$(MODULES))
-       ocamlopt -pack -o $@ $^
-http.cma: http.cmo
-       $(OCAMLC) -a -o $@ $<
-http.cmxa: http.cmx
-       $(OCAMLOPT) -a -o $@ $<
+http.cma: $(patsubst %,%.cmo,$(MODULES))
+       $(OCAMLC) -a -o $@ $^
+http.cmxa: $(patsubst %,%.cmx,$(MODULES))
+       $(OCAMLOPT) -a -o $@ $^
 
 meta: META
 META: META.in
@@ -55,7 +52,8 @@ dist: distclean depend
        rm -rf $(DISTDIR)/
 install: META
        $(OCAMLFIND) install -destdir $(DESTDIR) $(PKGNAME)     \
-               META common.mli types.mli request.mli daemon.mli response.mli http.*
+               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 \