- wrong version of drop was used in four places

[helm.git] / matita / matita / contribs / lambdadelta / Makefile

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index a5502a41c1f36788fd19502d611ec170682bf4ec..2945fc62c91d5e43d9a1e8d910f116af0557afeb 100644 (file)
--- 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,9 @@ PRB_OPTS     := $(XOA_OPTS) -g
 ORIG         := . ./orig.sh 
 ORIGS        := basic_2/basic_1.orig
 
-TAGS := all xoa xoa2 orig elim deps stats tbls trim
+CONTRIB      := lambdadelta_2
+
+TAGS := all xoa xoa2 orig elim deps top leaf stats tbls trim contrib
 
 PACKAGES := ground_2 basic_2 apps_2
 
@@ -74,8 +78,8 @@ $(XOA2_TARGETS): $(XOA2_CONF)
 # elim #######################################################################
 
 elim:
-       @echo "  MATITADEP"
-       $(H)grep "elim (.*?)" $(MAS)
+       @echo "  GREP elim"
+       $(H)grep "elim (.*?)" $(MAS) || true
 
 # orig #######################################################################
 
@@ -83,11 +87,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 ######################################################################
 
@@ -95,16 +117,16 @@ define STATS_TEMPLATE
   STT_$(1) := $(1).stats
   STTS     += $$(STT_$(1))
 
-  $$(STT_$(1)): S0  = $$(shell cat $(1)/$(1)_probe.txt)    
+  $$(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)
 
@@ -157,21 +179,21 @@ define SUMMARY_TEMPLATE
   SUM_$(1) := $(1)/web/$(1)_sum.tbl  
   SUMS     += $$(SUM_$(1))
 
-  $$(SUM_$(1)): S0 = $$(shell cat $(1)/$(1)_probe.txt)  
+  $$(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)): 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)): $$(MAS_$(1)) $(1)/$(1)_probe.txt $(1)/$(1)_mac.txt
        @printf '  SUMMARY $(1)\n'
        @printf 'name "$$(basename $$(@F))"\n\n'                >  $$@
        @printf 'table {\n'                                     >> $$@
-       @printf '   class "grey"   [ "category"\n'              >> $$@
+       @printf '   class "gray"   [ "category"\n'              >> $$@
        @printf '      [ "objects" * ]\n'                       >> $$@
        @printf '   ]\n'                                        >> $$@
        @printf '   class "cyan"   [ "sizes"\n'                 >> $$@
@@ -213,6 +235,12 @@ TRIMS := $(MAS) $(TBLS) $(LDWS)
 
 trim: $(TRIMS:%=%.trimmed)
 
+# contrib ####################################################################
+
+contrib:
+       @echo "  TAR -czf $(CONTRIB).tar.gz root *.ma"
+       $(H)tar -czf $(CONTRIB).tar.gz root $(MAS)
+
 ##############################################################################
 
 .PHONY: $(TAGS)