X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Focaml-http%2FMakefile;h=adc4627d8b86dbcc962304c1657bf8d0904f9e82;hb=ac7687ce66526f905874ed99a845223c853c558a;hp=90ab28781a500ab06f3721cc8ce253d47feabf9b;hpb=113bef6891e9ddaba7d81addbc1b2182fb234913;p=helm.git

diff --git a/helm/DEVEL/ocaml-http/Makefile b/helm/DEVEL/ocaml-http/Makefile
index 90ab28781..adc4627d8 100644
--- a/helm/DEVEL/ocaml-http/Makefile
+++ b/helm/DEVEL/ocaml-http/Makefile
@@ -1,15 +1,22 @@
 include Makefile.defs
 
-MODULES =	\
-	http_types http_constants http_tcp_server http_parser_sanity	\
-	http_misc http_common http_parser http_message http_request		\
-	http_daemon http_response
+MODULES = \
+	http_types http_constants http_parser_sanity http_misc http_common \
+	http_tcp_server http_parser http_message http_request http_daemon \
+	http_response http_user_agent
+
 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_request http_daemon http_response
+PUBLIC_MODULES = \
+	http_common http_message http_request http_daemon http_response \
+	http_user_agent
 PUBLIC_IMPL = http_types
-DESTDIR = $(shell $(OCAMLFIND) printconf stdlib) 
+OCAMLDOC_STUFF = *.mli $(patsubst %, %.ml, $(PUBLIC_IMPL))
+DOCDIR = doc/html
+DOTDIR = doc/dot
+TEXDIR = doc/latex
+DESTDIR = $(shell $(OCAMLFIND) printconf destdir) 
 
 all: all_non_mt all_mt
 opt: opt_non_mt opt_mt
@@ -18,9 +25,14 @@ 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 $(patsubst %, %.ml, $(PUBLIC_IMPL))
+doc: $(DOTDIR)/ocaml-http.ps $(TEXDIR)/ocaml-http.tex $(OCAMLDOC_STUFF)
+	$(OCAMLDOC) -html -d $(DOCDIR) $(OCAMLDOC_STUFF)
+$(TEXDIR)/ocaml-http.tex: $(OCAMLDOC_STUFF)
+	$(OCAMLDOC) -latex -o $@ $^
+$(DOTDIR)/ocaml-http.ps: $(DOTDIR)/ocaml-http.dot
+	$(DOT) -Tps $< > $@
+$(DOTDIR)/ocaml-http.dot: *.ml *.mli
+	$(OCAMLDOC) -dot -o $(DOTDIR)/ocaml-http.dot *.ml *.mli
 
 examples:
 	$(MAKE) -C examples/
@@ -74,10 +86,13 @@ clean:
 	done
 	rm -f {mt,non_mt}/$(THREADED_SRV).mli
 docclean:
-	rm -f doc/html/*.html doc/html/*.css
-distclean: clean docclean
+	rm -f	\
+		$(DOCDIR)/*.html $(DOCDIR)/*.css	\
+		$(DOTDIR)/*.dot $(DOTDIR)/*.ps	\
+		$(TEXDIR)/*.tex
+distclean: clean
 	$(MAKE) -C examples/ distclean
-	-rm -f META
+	rm -f META
 dist: distreal distrm
 distreal: distclean depend
 	if [ -d $(DISTDIR) ]; then rm -rf $(DISTDIR); else true; fi
@@ -85,7 +100,7 @@ distreal: distclean depend
 	for f in	\
 			$(patsubst %, %.ml, $(MODULES))	\
 			$(patsubst %, %.mli, $(MODULES) $(THREADED_SRV))	\
-			mt/ non_mt/ $(EXTRA_DIST) examples/	debian/;	\
+			mt/ non_mt/ $(EXTRA_DIST) examples/ debian/;	\
 	do	\
 		cp -r $$f $(DISTDIR)/;	\
 	done
@@ -94,7 +109,7 @@ distreal: distclean depend
 	tar cvzf $(DISTDIR).tar.gz $(DISTDIR)/
 distrm:
 	rm -rf $(DISTDIR)/
-deb: distreal
+deb: docclean distreal
 	(cd $(DISTDIR)/ && debuild)
 	rm -rf $(DISTDIR)/
 install: META
@@ -109,4 +124,3 @@ install: META
 	all opt world all_non_mt all_mt opt_non_mt opt_mt	\
 	examples examples.opt depend clean distclean dist	\
 	install meta doc deb distreal distrm
-