the refactoring continues ...

[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 3322009493713faf1d7871f07e0c0eed37895572..80019a80056682998c979964787d03002d6fad9c 100644 (file)
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -1,16 +1,24 @@
 H=@
+ifeq ($(origin OCAMLPATH), undefined)
+   OCAMLFIND = OCAMLPATH=$(HOME)/svn/software/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
+RELISE = $(MAIN:%=%_$(shell cat MakeVersion))
 
-DIRECTORIES = $(shell cat Make)
+LDDLURL = http://lambda-delta.info/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 = $(HOME)/public_html/lddl
+
+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
@@ -58,13 +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 $^ 
 
+relise: clean
+       @echo "  RELISE $(RELISE)"
+       $(H)mkdir -p $(RELISE)
+       $(H)$(foreach FILE, $(shell cat Make), cp --parents $(FILE) $(RELISE);)
+       $(H)tar -czf etc/$(RELISE).tar.gz $(RELISE)
+       $(H)scp etc/$(RELISE).tar.gz $(DOWNDIR)
+
 tgz: clean
        @echo "  TAR -czf $(MAIN:%=%.tgz) . $(DIRECTORIES)" 
        $(H)find -name "Make*" | xargs $(TAR) $(KEEP)