From 0ce94466cf5d72a8c5afeb9f15f8a0cd4e8576b0 Mon Sep 17 00:00:00 2001
From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Thu, 3 Feb 2005 22:19:48 +0000
Subject: [PATCH] removed Makefile.overrides

---
 helm/DEVEL/ocaml-http/Makefile      | 15 ++++++++-------
 helm/DEVEL/ocaml-http/Makefile.defs |  5 ++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/helm/DEVEL/ocaml-http/Makefile b/helm/DEVEL/ocaml-http/Makefile
index adc4627d8..3930ea14e 100644
--- a/helm/DEVEL/ocaml-http/Makefile
+++ b/helm/DEVEL/ocaml-http/Makefile
@@ -1,7 +1,7 @@
 include Makefile.defs
 
 MODULES = \
-	http_types http_constants http_parser_sanity http_misc http_common \
+	http_constants http_types http_parser_sanity http_misc http_common \
 	http_tcp_server http_parser http_message http_request http_daemon \
 	http_response http_user_agent
 
@@ -9,10 +9,14 @@ 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_message http_request http_daemon http_response \
+	http_types	\
+	http_common	\
+	http_message	\
+	http_request	\
+	http_daemon	\
+	http_response	\
 	http_user_agent
-PUBLIC_IMPL = http_types
-OCAMLDOC_STUFF = *.mli $(patsubst %, %.ml, $(PUBLIC_IMPL))
+OCAMLDOC_STUFF = *.mli
 DOCDIR = doc/html
 DOTDIR = doc/dot
 TEXDIR = doc/latex
@@ -50,7 +54,6 @@ depend:
 	$(OCAMLC) -c $<
 %.cmx: %.ml %.cmi
 	$(OCAMLOPT) -c $<
-include Makefile.overrides
 
 non_mt/$(THREADED_SRV).cmo: non_mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi
 	cp $(THREADED_SRV).{cmi,mli} non_mt/
@@ -115,9 +118,7 @@ deb: docclean distreal
 install: META
 	$(OCAMLFIND) install -destdir $(DESTDIR) $(PKGNAME)	\
 		$(patsubst %, %.mli, $(PUBLIC_MODULES))	\
-		$(patsubst %, %.ml, $(PUBLIC_IMPL))	\
 		$(patsubst %, %.cmi, $(PUBLIC_MODULES))	\
-		$(patsubst %, %.cmi, $(PUBLIC_IMPL))	\
 		http{,_mt}.cm{,x}a http{,_mt}.a META
 
 .PHONY:	\
diff --git a/helm/DEVEL/ocaml-http/Makefile.defs b/helm/DEVEL/ocaml-http/Makefile.defs
index 6fd4b75f8..a8dfd5fe2 100644
--- a/helm/DEVEL/ocaml-http/Makefile.defs
+++ b/helm/DEVEL/ocaml-http/Makefile.defs
@@ -19,7 +19,6 @@ DOT = dot
 DISTNAME = ocaml-http
 DISTDIR = $(DISTNAME)-$(DISTVERSION)
 EXTRA_DIST =	\
-	INSTALL LICENSE README META.in Makefile Makefile.defs Makefile.overrides	\
-	.depend tophttp doc
-
+	INSTALL LICENSE README META.in Makefile Makefile.defs	\
+	.depend doc
 
-- 
2.39.2