X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2FMakefile;h=d7b1089af45d31a22cd9fbc27e745f72e79f0c0c;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=c9e1a3bc5a8395eb64d6b66ac33137c60b352111;hpb=2cc3fd2e990f36f3b389e7184213b87d437a43ba;p=helm.git

diff --git a/helm/http_getter/Makefile b/helm/http_getter/Makefile
index c9e1a3bc5..d7b1089af 100644
--- a/helm/http_getter/Makefile
+++ b/helm/http_getter/Makefile
@@ -1,72 +1,31 @@
-VERSION = 0.2.1
+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
-OCAMLFIND = ocamlfind
-OCAMLC = $(OCAMLFIND) ocamlc $(COMMONOPTS)
-OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMONOPTS)
-OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMONOPTS)
-OCAMLDOC =	\
-	ocamldoc	\
-		$(shell $(OCAMLFIND) query -i-format http)	\
-		$(shell $(OCAMLFIND) query -i-format dbm)	\
-		$(shell $(OCAMLFIND) query -i-format pcre)	\
-		$(shell $(OCAMLFIND) query -i-format netclient)	\
-		$(shell $(OCAMLFIND) query -i-format pxp)	\
-		$(shell $(OCAMLFIND) query -i-format shell)	\
-		$(shell $(OCAMLFIND) query -i-format threads)	\
-		$(shell $(OCAMLFIND) query -i-format zip)
-MODULES =	\
-	http_getter_debugger threadSafe							\
-	http_getter_types http_getter_misc http_getter_const	\
-	http_getter_env 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 $@ $^
-
-http_getter.dot: *.ml *.mli
-	$(OCAMLDOC) -dot -o $@ $^
 
 distclean: clean
+	rm -f buildTimeOpts.ml
 clean:
 	rm -f *.cm[aiox] *.o $(NAME){,.opt} *.dot
-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)/
 
-.PHONY: all byte opt world depend clean
+.PHONY: all byte opt world clean distclean