From d122b195b5cbbd6ab33fe5bc43d22c79b9210a49 Mon Sep 17 00:00:00 2001
From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Thu, 14 Nov 2002 11:36:36 +0000
Subject: [PATCH] Now use cm{,x}a

---
 helm/DEVEL/ocaml-http/.cvsignore        |  4 ++++
 helm/DEVEL/ocaml-http/META.in           |  4 ++--
 helm/DEVEL/ocaml-http/Makefile          | 13 +++++++++----
 helm/DEVEL/ocaml-http/examples/Makefile |  4 ++--
 4 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 helm/DEVEL/ocaml-http/.cvsignore

diff --git a/helm/DEVEL/ocaml-http/.cvsignore b/helm/DEVEL/ocaml-http/.cvsignore
new file mode 100644
index 000000000..fd405f9e4
--- /dev/null
+++ b/helm/DEVEL/ocaml-http/.cvsignore
@@ -0,0 +1,4 @@
+*.cmi
+*.cmo
+*.cmx
+*.cma
diff --git a/helm/DEVEL/ocaml-http/META.in b/helm/DEVEL/ocaml-http/META.in
index 5471c4f10..fbabc0973 100644
--- a/helm/DEVEL/ocaml-http/META.in
+++ b/helm/DEVEL/ocaml-http/META.in
@@ -1,5 +1,5 @@
 description = "OCaml HTTP daemon library"
 version = "@DISTVERSION@"
 requires = "unix,pcre,netstring"
-archive(byte) = "http.cmo"
-archive(native) = "http.cmx"
+archive(byte) = "http.cma"
+archive(native) = "http.cmxa"
diff --git a/helm/DEVEL/ocaml-http/Makefile b/helm/DEVEL/ocaml-http/Makefile
index 473b6b8f2..950c72035 100644
--- a/helm/DEVEL/ocaml-http/Makefile
+++ b/helm/DEVEL/ocaml-http/Makefile
@@ -3,8 +3,8 @@ include Makefile.defs
 MODULES = common misc types request daemon response
 DESTDIR = $(shell $(OCAMLFIND) printconf stdlib) 
 
-all: http.cmo
-opt: http.cmx
+all: http.cma
+opt: http.cmxa
 world: all opt
 
 examples:
@@ -28,6 +28,10 @@ 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 $@ $<
 
 meta: META
 META: META.in
@@ -35,7 +39,7 @@ META: META.in
 
 clean:
 	$(MAKE) -C examples/ clean
-	-rm -f *.cm[ioax] *.o test{,.opt}
+	-rm -f *.cm[ioax] *.cmxa *.[ao] test{,.opt}
 distclean: clean
 	$(MAKE) -C examples/ distclean
 	-rm -f META
@@ -50,7 +54,8 @@ 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 common.mli types.mli request.mli daemon.mli response.mli http.*
 
 .PHONY:	\
 	all opt world examples examples.opt depend clean distclean dist	\
diff --git a/helm/DEVEL/ocaml-http/examples/Makefile b/helm/DEVEL/ocaml-http/examples/Makefile
index b050bddb3..51e5e2f3b 100644
--- a/helm/DEVEL/ocaml-http/examples/Makefile
+++ b/helm/DEVEL/ocaml-http/examples/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.defs
-OBJS = ../http.cmo
-OBJS_OPT = ../http.cmx
+OBJS = ../http.cma
+OBJS_OPT = ../http.cmxa
 EXAMPLES_OPTS = -I .. -linkpkg
 
 EXAMPLES = always_ok_daemon webfsd obj_foo dump_args timeout
-- 
2.39.2