X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2FMakefile.common;h=5d007032ebfc10dc585c234079b5ba57f5380640;hb=e7f64fe2cc67f3514131c8831f87311ff600d005;hp=ca219ca6651ab4df0e1fdbc5a45db280e5027330;hpb=da715664068e859d20ab81fd6969e64d58c0f57e;p=helm.git

diff --git a/helm/software/lambda-delta/Makefile.common b/helm/software/lambda-delta/Makefile.common
index ca219ca66..5d007032e 100644
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -1,20 +1,29 @@
 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
+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))
@@ -57,16 +66,20 @@ $(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)
+lint-xml-local: $(LOCALXMLS)
+	@echo XMLLINT --valid
+	$(H)$(XMLLINT) $(XMLLINTLOCAL) --valid $^ 
+
+#tgz: clean
+#	@echo "  TAR -czf $(MAIN:%=%.tgz) . $(DIRECTORIES)" 
+#	$(H)find -name "Make*" | xargs $(TAR) $(KEEP)
 
 %.ml %.mli: %.mly
 	@echo "  OCAMLYACC $<"