update in basic_2

[helm.git] / helm / software / helena / Makefile.common

diff --git a/helm/software/helena/Makefile.common b/helm/software/helena/Makefile.common
index 6845800d5653f24dc5430cb8243a1fccae4dfad5..1db6ea34085d002b29f9bdfcbfb1852ee5cdb71c 100644 (file)
--- a/helm/software/helena/Makefile.common
+++ b/helm/software/helena/Makefile.common
@@ -1,9 +1,6 @@
 H=@
-ifeq ($(origin OCAMLPATH), undefined)
-   OCAMLFIND = OCAMLPATH=$(HOME)/svn/claudio/components/METAS ocamlfind
-else
-   OCAMLFIND = ocamlfind
-endif
+OCAMLPATH ?= /home/fguidi/svn/matita_patched/components/METAS
+OCAMLFIND = OCAMLPATH=$(OCAMLPATH) ocamlfind
 
 RELISE = $(MAIN:%=%_$(shell cat MakeVersion))
 
@@ -24,6 +21,8 @@ OCAMLLEX  = ocamllex.opt
 OCAMLYACC = ocamlyacc -v
 TAR       = tar -czf etc/$(MAIN:%=%.tgz)
 
+CALLMAKE = $(MAKE) --no-print-directory
+
 define DIR_TEMPLATE
    MODULES += $$(addprefix $(1)/,$$(shell cat $(1)/Make))
 endef
@@ -69,18 +68,12 @@ B_OBJECTS = $(patsubst %.ml,%.cmo,$(SOURCES:%.mli=%.cmi))
 
 CLEAN += $(MAIN).opt
 
-all opt: .depend.opt
-       @$(MAKE) --no-print-directory $(MAIN).opt
-
-byte: .depend.byte
-       @$(MAKE) --no-print-directory $(MAIN).byte
-
 $(MAIN).opt: $(O_OBJECTS)
        @echo "  OCAMLOPT -o $(MAIN).opt"
        $(H)$(OCAMLOPT) -o $(MAIN).opt $(CMXS)
 
 $(MAIN).byte: $(B_OBJECTS)
-       @echo "  OCAMC -o $(MAIN).byte"
+       @echo "  OCAMLC -o $(MAIN).byte"
        $(H)$(OCAMLC) -o $(MAIN).byte $(CMOS)
 
 .depend.opt: $(SOURCES) 
@@ -123,7 +116,7 @@ etc:
        @echo "  OCAMLC $<"
        $(H)$(OCAMLC) -c $<
 
-O_TAGS += all opt $(MAIN).opt
+O_TAGS += opt $(MAIN).opt
 
 B_TAGS += byte $(MAIN).byte