ocaml 3.09 transition

[helm.git] / helm / http_getter / Makefile

diff --git a/helm/http_getter/Makefile b/helm/http_getter/Makefile
index 1c727bff26c5449bd333d0729abee26a01c14861..d7b1089af45d31a22cd9fbc27e745f72e79f0c0c 100644 (file)
--- a/helm/http_getter/Makefile
+++ b/helm/http_getter/Makefile
@@ -1,58 +1,31 @@
-VERSION = 0.2.0
+VERSION = 0.3.0
 NAME = http_getter
-DISTDIR = http-getter-$(VERSION)
-REQUIRES = http dbm pcre netclient pxp shell threads zip
-COMMONOPTS = -package "$(REQUIRES)" -pp camlp4o
-OCAMLC = ocamlfind ocamlc $(COMMONOPTS)
-OCAMLOPT = ocamlfind ocamlopt $(COMMONOPTS)
-OCAMLDEP = ocamlfind ocamldep $(COMMONOPTS)
-MODULES =      \
-       http_getter_debugger threadSafe                                                 \
-       http_getter_types http_getter_misc http_getter_env              \
-       http_getter_const http_getter_common http_getter_map    \
-       http_getter_cache
 
-OBJS = $(patsubst %,%.cmo,$(MODULES))
-OBJSOPT = $(patsubst %,%.cmx,$(MODULES))
+REQUIRES = helm-getter helm-logger helm-registry netstring
+COMMONOPTS = -package "$(REQUIRES)" -pp camlp4o -thread
+OCAMLFIND = OCAMLPATH=../ocaml/METAS ocamlfind
+OCAMLC = $(OCAMLFIND) ocamlc -g $(COMMONOPTS)
+OCAMLOPT = $(OCAMLFIND) opt $(COMMONOPTS)
 
 all: byte
 byte: $(NAME)
 opt: $(NAME).opt
 world: byte opt
 
-include .depend
-depend:
-       $(OCAMLDEP) *.ml *.mli > .depend
+$(NAME): buildTimeOpts.cmo main.ml
+       $(OCAMLC) -linkpkg -o $@ $^
+$(NAME).opt: buildTimeOpts.cmx main.ml
+       $(OCAMLOPT) -linkpkg -o $@ $^
 
-%.cmi: %.mli
+%.cmo: %.ml
        $(OCAMLC) -c $<
-%.cmo: %.ml %.cmi
-       $(OCAMLC) -c $<
-%.cmx: %.ml %.cmi
-       $(OCAMLOPT) -c $<
-include Makefile.overrides
-$(NAME).cmo: $(NAME).ml
-       $(OCAMLC) -c $<
-$(NAME).cmx: $(NAME).ml
+%.cmx: %.ml
        $(OCAMLOPT) -c $<
-$(NAME): $(OBJS) $(NAME).ml
-       $(OCAMLC) -linkpkg -thread -o $@ $^
-$(NAME).opt: $(OBJSOPT) $(NAME).ml
-       $(OCAMLOPT) -linkpkg -thread -o $@ $^
 
 distclean: clean
+       rm -f buildTimeOpts.ml
 clean:
-       rm -f *.cm[aiox] *.o $(NAME){,.opt}
-dist: distclean depend
-       mkdir $(DISTDIR)/
-       cp      \
-               $(patsubst %, %.ml, $(MODULES)) \
-               $(patsubst %, %.mli, $(MODULES))        \
-               $(NAME).ml      \
-               Makefile .depend        \
-               $(DISTDIR)/
-       tar cvzf $(DISTDIR).tar.gz $(DISTDIR)/
-       rm -rf $(DISTDIR)/
+       rm -f *.cm[aiox] *.o $(NAME){,.opt} *.dot
 
-.PHONY: all byte opt world depend clean
+.PHONY: all byte opt world clean distclean