now we take the NUri module from the helm-ng_kernel packeage

[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 9e2ef7f24cc20ba9f44a6a079860ae009368d4a2..25e67cc1be2949042799dfc6b30411b68ad2807e 100644 (file)
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -1,4 +1,9 @@
 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
@@ -10,13 +15,13 @@ 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 -rectypes -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))
@@ -59,16 +64,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 $<"