X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2FMakefile;h=16c000e67d01e8a42015640a27d54d87b9e40641;hb=93c509f03ffa0d622fa76e39addf32966a173147;hp=a5502a41c1f36788fd19502d611ec170682bf4ec;hpb=65008df95049eb835941ffea1aa682c9253c4c2b;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index a5502a41c..16c000e67 100644
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -4,18 +4,20 @@ H    := @
 TRIM := sed "s/ \\+$$//"
 
 XOA_CONF     := ground_2/xoa.conf.xml
-XOA_TARGETS  := ground_2/xoa_notation.ma ground_2/xoa.ma
+XOA_TARGETS  := ground_2/notation/xoa_notation.ma ground_2/xoa/xoa.ma
 
 XOA_DIR      := ../../../components/binaries/xoa
 XOA          := xoa.native
 XOA_OPTS     := ../../matita.conf.xml $(XOA_CONF)
 
 XOA2_CONF    := ground_2/xoa2.conf.xml
-XOA2_TARGETS := ground_2/xoa2_notation.ma ground_2/xoa2.ma
+XOA2_TARGETS := ground_2/notation/xoa2_notation.ma ground_2/xoa/xoa2.ma
 XOA2_OPTS    := ../../matita.conf.xml $(XOA2_CONF)
 
+DEP_INPUT    := .depend
 DEP_DIR      := ../../../components/binaries/matitadep
 DEP          := matitadep.native
+DEP_OPTS     :=
 
 MAC_DIR      := ../../../components/binaries/mac
 MAC          := mac.native
@@ -28,7 +30,7 @@ PRB_OPTS     := $(XOA_OPTS) -g
 ORIG         := . ./orig.sh 
 ORIGS        := basic_2/basic_1.orig
 
-TAGS := all xoa xoa2 orig elim deps stats tbls trim
+TAGS := all xoa xoa2 orig elim deps top leaf stats tbls trim
 
 PACKAGES := ground_2 basic_2 apps_2
 
@@ -74,8 +76,8 @@ $(XOA2_TARGETS): $(XOA2_CONF)
 # elim #######################################################################
 
 elim:
-	@echo "  MATITADEP"
-	$(H)grep "elim (.*?)" $(MAS)
+	@echo "  GREP elim"
+	$(H)grep "elim (.*?)" $(MAS) || true
 
 # orig #######################################################################
 
@@ -83,11 +85,29 @@ orig: $(ORIGS)
 	@echo "  ORIG basic_2"
 	$(H)$(ORIG) basic_2 < $<
 
+# dep input ##################################################################
+
+$(DEP_INPUT): $(MAS)
+	@echo "  GREP include"
+	$(H)grep "include \"" $^ > $(DEP_INPUT)
+
 # dep ########################################################################
 
-deps: $(DEP_DIR)/$(DEP)
-	@echo "  MATITADEP"
-	$(H)grep "include \"" $(MAS) | $<
+deps: $(DEP_INPUT)
+	@echo "  MATITADEP -c"
+	$(H)$(DEP_DIR)/$(DEP) -c $(DEP_OPTS) < $<
+
+# top ########################################################################
+
+top: $(DEP_INPUT)
+	@echo "  MATITADEP -t"
+	$(H)$(DEP_DIR)/$(DEP) -t $(DEP_OPTS) < $<
+
+# leaf #######################################################################
+
+leaf: $(DEP_INPUT)
+	@echo "  MATITADEP -l"
+	$(H)$(DEP_DIR)/$(DEP) -l $(DEP_OPTS) < $<
 
 # stats ######################################################################
 
@@ -98,13 +118,13 @@ define STATS_TEMPLATE
   $$(STT_$(1)): S0  = $$(shell cat $(1)/$(1)_probe.txt)    
   $$(STT_$(1)): S1  = $$(shell cat $(1)/$(1)_mac.txt)
   $$(STT_$(1)): S4  = $$(shell ls $$(MAS_$(1)) | wc -l)
-  $$(STT_$(1)): P1  = $$(shell grep "theorem " $$(MAS_$(1)) | wc -l)
-  $$(STT_$(1)): P2  = $$(shell grep "lemma " $$(MAS_$(1)) | wc -l)
-  $$(STT_$(1)): P3  = $$(shell grep "fact " $$(MAS_$(1)) | wc -l)
+  $$(STT_$(1)): P1  = $$(shell grep "^theorem " $$(MAS_$(1)) | wc -l)
+  $$(STT_$(1)): P2  = $$(shell grep "^lemma " $$(MAS_$(1)) | wc -l)
+  $$(STT_$(1)): P3  = $$(shell grep "^fact " $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): P4  = $$(shell grep qed $$(MAS_$(1)) | wc -l)
-  $$(STT_$(1)): C1  = $$(shell grep "inductive \|record " $$(MAS_$(1)) | wc -l)
-  $$(STT_$(1)): C2  = $$(shell grep "definition \|let rec " $$(MAS_$(1)) | wc -l)
-  $$(STT_$(1)): M1  = $$(shell grep "axiom " $$(MAS_$(1)) | wc -l)
+  $$(STT_$(1)): C1  = $$(shell grep "^inductive \|^record " $$(MAS_$(1)) | wc -l)
+  $$(STT_$(1)): C2  = $$(shell grep "^definition \|^let rec " $$(MAS_$(1)) | wc -l)
+  $$(STT_$(1)): M1  = $$(shell grep "^axiom " $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M2  = $$(shell grep "$$(OPEN)\*[^*:]*$$$$" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M3  = $$(shell grep "(\*\*)" $$(MAS_$(1)) | wc -l)
 
@@ -160,12 +180,12 @@ define SUMMARY_TEMPLATE
   $$(SUM_$(1)): S0 = $$(shell cat $(1)/$(1)_probe.txt)  
   $$(SUM_$(1)): S1 = $$(shell cat $(1)/$(1)_mac.txt)
   $$(SUM_$(1)): S4 = $$(shell ls $$(MAS_$(1)) | wc -l)  
-  $$(SUM_$(1)): C1 = $$(shell grep "inductive \|record " $$(MAS_$(1)) | wc -l)
-  $$(SUM_$(1)): C2 = $$(shell grep "definition \|let rec " $$(MAS_$(1)) | wc -l)
-  $$(SUM_$(1)): C3 = $$(shell grep "inductive \|record \|definition \|let rec " $$(MAS_$(1)) | wc -l)
-  $$(SUM_$(1)): P1 = $$(shell grep "theorem " $$(MAS_$(1)) | wc -l)
-  $$(SUM_$(1)): P2 = $$(shell grep "lemma " $$(MAS_$(1)) | wc -l)
-  $$(SUM_$(1)): P3 = $$(shell grep "lemma \|theorem " $$(MAS_$(1)) | wc -l)
+  $$(SUM_$(1)): C1 = $$(shell grep "^inductive \|^record " $$(MAS_$(1)) | wc -l)
+  $$(SUM_$(1)): C2 = $$(shell grep "^definition \|^let rec " $$(MAS_$(1)) | wc -l)
+  $$(SUM_$(1)): C3 = $$(shell grep "^inductive \|^record \|^definition \|^let rec " $$(MAS_$(1)) | wc -l)
+  $$(SUM_$(1)): P1 = $$(shell grep "^theorem " $$(MAS_$(1)) | wc -l)
+  $$(SUM_$(1)): P2 = $$(shell grep "^lemma " $$(MAS_$(1)) | wc -l)
+  $$(SUM_$(1)): P3 = $$(shell grep "^lemma \|^theorem " $$(MAS_$(1)) | wc -l)
 
   $$(SUM_$(1)): $$(MAS_$(1)) $(1)/$(1)_probe.txt $(1)/$(1)_mac.txt
 	@printf '  SUMMARY $(1)\n'