we are optimizing the code by conditional compilation.

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

diff --git a/helm/software/helena/Makefile.common b/helm/software/helena/Makefile.common
index 902f37a3db557e6b748f50b25d24e368161b6c16..0fdcc05d6342830d8a71edd530811461a293a9c7 100644 (file)
--- a/helm/software/helena/Makefile.common
+++ b/helm/software/helena/Makefile.common
@@ -1,20 +1,24 @@
 H=@
 ifeq ($(origin OCAMLPATH), undefined)
-   OCAMLFIND = OCAMLPATH=$(HOME)/svn/helm-stable/software/components/METAS ocamlfind
+   OCAMLFIND = OCAMLPATH=$(HOME)/svn/claudio/components/METAS ocamlfind
 else
    OCAMLFIND = ocamlfind
 endif
 
 RELISE = $(MAIN:%=%_$(shell cat MakeVersion))
 
-DOWNDIR = $(HOME)/svn/helm-stable/www/lambda_delta/download
+DOWNDIR = ../../www/lambdadelta/download
 
 DIRECTORIES = $(addprefix $(SRC)/,$(shell cat $(SRC)/Make))
 
 INCLUDES = $(DIRECTORIES:%=-I %) 
 
-OCAMLDEP  = $(OCAMLFIND) ocamldep -native $(INCLUDES)
-OCAMLOPT  = $(OCAMLFIND) opt $(OCAMLOPTIONS) -linkpkg -package "$(REQUIRES)" $(INCLUDES)
+CAMLP = -pp "camlp5o pa_macro.cmo $(CAMLPOPTIONS)"
+
+CAMLPOPTIONS = $(F:%=-D%)
+
+OCAMLDEP  = $(OCAMLFIND) ocamldep $(CAMLP) -native $(INCLUDES)
+OCAMLOPT  = $(OCAMLFIND) opt $(CAMLP) $(OCAMLOPTIONS) -linkpkg -package "$(REQUIRES)" $(INCLUDES)
 OCAMLLEX  = ocamllex.opt
 OCAMLYACC = ocamlyacc -v
 TAR       = tar -czf etc/$(MAIN:%=%.tgz)
@@ -91,6 +95,6 @@ etc:
        @echo "  OCAMLOPT $<"
        $(H)$(OCAMLOPT) -c $<
 
-TAGS += $(MAIN).opt
+TAGS += all opt $(MAIN).opt
 
 $(foreach TAG, $(TAGS), $(eval $(call INCLUDE_TEMPLATE, $(TAG))))