when making 'dist' remove old spurious dist directories

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

diff --git a/helm/DEVEL/ocaml-http/Makefile b/helm/DEVEL/ocaml-http/Makefile
index 6c9b44ce83d605b56f65f0ac984c3264b620ab29..48c26758986b9c45d958f8a44cec1992951af745 100644 (file)
--- a/helm/DEVEL/ocaml-http/Makefile
+++ b/helm/DEVEL/ocaml-http/Makefile
@@ -1,6 +1,8 @@
 include Makefile.defs
 
-MODULES = http_common http_misc http_types http_request http_parser http_tcp_server http_daemon http_response
+MODULES =      \
+       http_types http_constants http_misc http_tcp_server http_common \
+       http_request http_parser 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))
@@ -72,22 +74,31 @@ docclean:
 distclean: clean docclean
        $(MAKE) -C examples/ distclean
        -rm -f META
-dist: distclean depend
+dist: distreal distrm
+distreal: distclean depend
+       if [ -d $(DISTDIR) ]; then rm -rf $(DISTDIR); else true; fi
        mkdir $(DISTDIR)
        cp -r   \
-               $(patsubst %,%.ml,$(MODULES)) $(patsubst %,%.mli,$(MODULES))    \
-               $(EXTRA_DIST) examples/ debian/ \
+               $(patsubst %, %.ml, $(MODULES)) \
+               $(patsubst %, %.mli, $(MODULES) $(THREADED_SRV))        \
+               mt/ non_mt/ $(EXTRA_DIST) examples/     debian/ \
                $(DISTDIR)/
        -find $(DISTDIR)/ -type d -name CVS -exec rm -rf {} \;
        -find $(DISTDIR)/ -type f -name ".cvs*" -exec rm -f {} \;
        tar cvzf $(DISTDIR).tar.gz $(DISTDIR)/
+distrm:
+       rm -rf $(DISTDIR)/
+deb: distreal
+       (cd $(DISTDIR)/ && debuild)
        rm -rf $(DISTDIR)/
 install: META
        $(OCAMLFIND) install -destdir $(DESTDIR) $(PKGNAME)     \
-               META $(patsubst %,%.mli,$(PUBLIC_MODULES))      \
-               $(patsubst %,%.cmi,$(PUBLIC_MODULES)) http.cm{,x}a http.a
+               $(patsubst %, %.mli, $(PUBLIC_MODULES)) \
+               $(patsubst %, %.cmi, $(PUBLIC_MODULES)) \
+               http{,_mt}.cm{,x}a http{,_mt}.a META
 
 .PHONY:        \
-       all opt world examples examples.opt depend clean distclean dist \
-       install meta doc
+       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