some fixes to cope with the new mowgli server architecture

[helm.git] / helm / software / lambda-delta / Makefile.common

diff --git a/helm/software/lambda-delta/Makefile.common b/helm/software/lambda-delta/Makefile.common
index ca219ca6651ab4df0e1fdbc5a45db280e5027330..434ece82f7aa6d84ff2aa5b05ca14f0404e1d110 100644 (file)
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -1,20 +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
-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 +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 $<"