X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2FMakefile.common;h=7a4727c769b0b1f4ae0dc0ebdd53e21f06a25030;hb=11b2157bacf59cfc561c2ef6f92ee41ee2c1a006;hp=b6ad6eb963c4b7a1f6775a0d1d9204f580977d5c;hpb=aef659e5893b4bf8c8544d0c54714e10f5b5493a;p=helm.git

diff --git a/helm/software/components/Makefile.common b/helm/software/components/Makefile.common
index b6ad6eb96..7a4727c76 100644
--- a/helm/software/components/Makefile.common
+++ b/helm/software/components/Makefile.common
@@ -7,20 +7,28 @@ H=@
 #  $IMPLEMENTATION_FILES
 #  $EXTRA_OBJECTS_TO_INSTALL
 #  $EXTRA_OBJECTS_TO_CLEAN
-# and put in a directory where there is a .depend file.
+# and put in a directory where there is a .depend or .depend.opt file.
 
 # $OCAMLFIND must be set to a meaningful vaule, including OCAMLPATH=
 
-PREPROCOPTIONS = -pp camlp4o
-SYNTAXOPTIONS = -syntax camlp4o
+ifeq ($(ANNOT),true)
+  ANNOTOPTION = -dtypes
+else
+  ANNOTOPTION =
+endif
+
+PREPROCOPTIONS = -pp camlp5o
+SYNTAXOPTIONS = -syntax camlp5o
 PREREQ =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread -rectypes $(ANNOTOPTION)
 OCAMLDEBUGOPTIONS = -g
+#OCAML_PROF=p -p a
 OCAMLARCHIVEOPTIONS =
 REQUIRES := $(shell $(OCAMLFIND) -query -format '%(requires)' helm-$(PACKAGE))
-OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLDEP = $(OCAMLFIND) ocamldep -package "camlp4 $(CAMLP4REQUIRES)" $(SYNTAXOPTIONS) $(OCAMLDEPOPTIONS) 
+OCAMLC = $(OCAMLFIND) ocamlc$(OCAML_PROF) $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+#OCAMLOPT_DEBUG_FLAGS = -p
+OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS) $(OCAMLOPT_DEBUG_FLAGS)
+OCAMLDEP = $(OCAMLFIND) ocamldep -package "camlp5 $(CAMLP5REQUIRES)" $(SYNTAXOPTIONS) $(OCAMLDEPOPTIONS) 
 OCAMLLEX = ocamllex
 OCAMLYACC = ocamlyacc
 
@@ -75,11 +83,12 @@ depend:: $(DEPEND_FILES)
 depend.opt:: $(DEPEND_FILES)
 	$(H)echo "  OCAMLDEP -native"
 	$(H)$(OCAMLDEP) -native \
-		$(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend
+		$(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend.opt
 
 $(PACKAGE).ps: .dep.dot
 	dot -Tps -o $@ $<
 
+# FG: .depend or .depend.opt? 
 .dep.dot: .depend
 	ocamldot < .depend > $@
 
@@ -129,13 +138,18 @@ STATS_FILES = \
 	echo -n "LOC:" >> .stats
 	wc -l $(STATS_FILES) | tail -1 | awk '{ print $$1 }' >> .stats
 
-.PHONY: all opt world backup depend install uninstall clean ocamlinit
+.PHONY: all opt backup depend depend.opt install uninstall clean ocamlinit
 
-ifneq ($(MAKECMDGOALS), depend)
- ifneq ($(MAKECMDGOALS), depend.opt)
-   include .depend   
- endif
+ifeq ($(MAKECMDGOALS),)
+  include .depend   
 endif
 
-NULL =
+ifeq ($(MAKECMDGOALS), all)
+  include .depend   
+endif
 
+ifeq ($(MAKECMDGOALS), opt)
+  include .depend.opt   
+endif
+
+NULL =