X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2FMakefile.common;h=434ece82f7aa6d84ff2aa5b05ca14f0404e1d110;hb=a8ae2efbf7e09d6ddbb1eb9fd79cafa4e045ff9a;hp=cd871301580b2d78cc5659878ef6eef1c66e9772;hpb=cd798346d31b14b8947e5801b87dc4f363607862;p=helm.git

diff --git a/helm/software/lambda-delta/Makefile.common b/helm/software/lambda-delta/Makefile.common
index cd8713015..434ece82f 100644
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -1,19 +1,27 @@
 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
+LDDLDIR = mowgli:/projects/helm/public_html/lambda-delta/static/lddl
+DOWNDIR = mowgli:/projects/helm/public_html/lambda-delta/download
+XMLDIR  = mowgli:/projects/helm/public_html/lambda-delta/xml
+LOCALLDDLDIR = ../../../public_html/lddl
 
-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 etc/$(MAIN:%=%.tgz)
+#TAR       = tar -czf etc/$(MAIN:%=%.tgz)
 
 define DIR_TEMPLATE
    MODULES += $$(addprefix $(1)/,$$(shell cat $(1)/Make))
@@ -56,16 +64,16 @@ $(MAIN).opt: $(OBJECTS)
 	$(H)$(OCAMLDEP) $^ > .depend.opt
 
 clean:
-	@echo "  CLEAN . $(DIRECTORIES)"
+	@echo "  CLEAN . $(SRC)"
 	$(H)find -name "*~" | xargs $(RM) $(CLEAN)
 
-lint: $(XMLS)
+lint-xml: $(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 $<"