X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2FMakefile.common;h=c47540beac9ff2e3c5aed7b0f4ffea6de23517f3;hb=fb74956a335a9cc38a6ced92e16256f10c4eed6e;hp=3649a8b07da9ab9d07da8da2c9ef19dbaa30e049;hpb=d5f1d21626a9df44030854abe3b96bb71c6348af;p=helm.git

diff --git a/helm/software/lambda-delta/Makefile.common b/helm/software/lambda-delta/Makefile.common
index 3649a8b07..c47540bea 100644
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -1,19 +1,26 @@
 H=@
+ifeq ($(origin OCAMLPATH), undefined)
+   OCAMLFIND = OCAMLPATH=../components/METAS ocamlfind
+else
+   OCAMLFIND = ocamlfind
+endif
 
 LDDLURL = http://helm.cs.unibo.it/lambda-delta/static/lddl
 LDDLDIR = /projects/helm/public_html/lambda-delta/static/lddl
+DOWNDIR = /projects/helm/public_html/lambda-delta/download
+XMLDIR  = /projects/helm/public_html/lambda-delta/xml
 
-DIRECTORIES = $(shell cat Make)
+DIRECTORIES = $(addprefix $(SRC)/,$(shell cat $(SRC)/Make))
 
 INCLUDES = $(DIRECTORIES:%=-I %) 
 
-OCAMLDEP  = ocamlfind ocamldep -native $(INCLUDES)
-OCAMLOPT  = ocamlfind opt -linkpkg -package "$(REQUIRES)" $(INCLUDES)
+OCAMLDEP  = $(OCAMLFIND) ocamldep -native $(INCLUDES)
+OCAMLOPT  = $(OCAMLFIND) opt $(OCAMLOPTIONS) -linkpkg -package "$(REQUIRES)" $(INCLUDES)
 OCAMLLEX  = ocamllex.opt
 OCAMLYACC = ocamlyacc -v
 XMLLINT   = xmllint --noout
 XSLT      = xsltproc
-TAR       = tar -czf $(MAIN:%=%.tgz)
+#TAR       = tar -czf etc/$(MAIN:%=%.tgz)
 
 define DIR_TEMPLATE
    MODULES += $$(addprefix $(1)/,$$(shell cat $(1)/Make))
@@ -56,16 +63,16 @@ $(MAIN).opt: $(OBJECTS)
 	$(H)$(OCAMLDEP) $^ > .depend.opt
 
 clean:
-	@echo "  CLEAN . $(DIRECTORIES)"
+	@echo "  CLEAN"
 	$(H)find -name "*~" | xargs $(RM) $(CLEAN)
 
 lint: $(XMLS)
 	@echo XMLLINT --valid
 	$(H)$(XMLLINT) --valid $^ 
 
-tgz: clean
-	@echo "  TAR -czf $(MAIN:%=%.tgz) . $(DIRECTORIES)" 
-	$(H)find -name "Make*" | xargs $(TAR) $(KEEP)
+#tgz: clean
+#	@echo "  TAR -czf $(MAIN:%=%.tgz) . $(DIRECTORIES)" 
+#	$(H)find -name "Make*" | xargs $(TAR) $(KEEP)
 
 %.ml %.mli: %.mly
 	@echo "  OCAMLYACC $<"