X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2FMakefile;h=4438f07b5be99ca54236b68d21ee1510311a8aca;hb=1aca50505c3ce6c76dd7d20d00e358707caffd4a;hp=dd955bcc233944487ee9c20cc2c53003194fe021;hpb=2f19651bcec24abfb1bf15ff7e1387daad1f6638;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index dd955bcc2..4438f07b5 100644
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -25,12 +25,12 @@ PRB_OPTS     := $(XOA_OPTS) -g -i
 ORIG         := . ./orig.sh 
 ORIGS        := basic_2/basic_1.orig
 
-CONTRIB      := lambdadelta_2
+CONTRIB      := lambdadelta_2B
 
 WWW          := ../../../../helm/www/lambdadelta
 
-TAGS := all xoa xoa2 orig elim deps top leaf stats tbls trim contrib clean \
-        www up-html
+TAGS := all xoa xoa2 orig elim deps top leaf stats tbls odeps trim contrib clean \
+        home up-home
 
 PACKAGES  := ground_2 static_2 basic_2 apps_2 alpha_1
 XPACKAGES := ground_2 static_2 basic_2
@@ -48,10 +48,14 @@ define MAS_TEMPLATE
   MAS_$(1) := $$(shell find $(1) -name "*.ma")
   MAS      += $$(MAS_$(1))
 
-$(1)/$(1)_probe.txt: $$(MAS_$(1))
+$(1)/probe.txt: $$(MAS_$(1))
 	@echo "  PROBE $(1)"
-	$$(H)$$(PRB_DIR)/$$(PRB) $$(PRB_OPTS) $(1) -sn -sc -on -oc -f -b $(1)/$(1)_deps.txt > $$@
-	$$(H)sort < $(1)/$(1)_deps.txt | uniq > $(1)/$(1)_deps_uniq.txt
+	$$(H)$$(PRB_DIR)/$$(PRB) $$(PRB_OPTS) $(1) -sn -sc -on -oc -f > $$@
+
+$(1)/deps.txt: $$(MAS_$(1))
+	@echo "  PROBE $(1)"
+	$$(H)$$(PRB_DIR)/$$(PRB) $$(PRB_OPTS) $(1) -b $$@
+
 endef
 
 $(foreach PKG, $(PACKAGES), $(eval $(call MAS_TEMPLATE,$(PKG))))
@@ -123,7 +127,7 @@ define STATS_TEMPLATE
   STT_$(1) := $(1).stats
   STTS     += $$(STT_$(1))
 
-  $$(STT_$(1)): C0 = $$(shell cat $(1)/$(1)_probe.txt)
+  $$(STT_$(1)): C0 = $$(shell cat $(1)/probe.txt)
   $$(STT_$(1)): C2 = $$(word 2, $$(C0))
   $$(STT_$(1)): C3 = $$(word 4, $$(C0))
   $$(STT_$(1)): O1 = $$(shell ls $$(MAS_$(1)) | wc -l)
@@ -140,7 +144,7 @@ define STATS_TEMPLATE
   $$(STT_$(1)): M2 = $$(shell grep "$$(OPEN)\*[^*:]*$$$$" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M3 = $$(shell grep "(\*\*)" $$(MAS_$(1)) | wc -l)
 
-$$(STT_$(1)): $$(MAS_$(1)) $(1)/$(1)_probe.txt
+$$(STT_$(1)): $$(MAS_$(1)) $(1)/probe.txt
 	@printf '\x1B[1;40;37m'
 	@printf '%-15s %-46s' 'Statistics for:' $(1)
 	@printf '\x1B[0m\n'
@@ -187,10 +191,10 @@ stats: $(STTS)
 # summary ####################################################################
 
 define SUMMARY_TEMPLATE
-  SUM_$(1) := $(1)/web/$(1)_sum.tbl  
+  SUM_$(1) := $(1)/web/$(1)_sum.tbl
   SUMS     += $$(SUM_$(1))
 
-  $$(SUM_$(1)): C0 = $$(shell cat $(1)/$(1)_probe.txt)
+  $$(SUM_$(1)): C0 = $$(shell cat $(1)/probe.txt)
   $$(SUM_$(1)): S1 = $$(word 1, $$(C0))
   $$(SUM_$(1)): S2 = $$(word 2, $$(C0))
   $$(SUM_$(1)): S3 = $$(word 3, $$(C0))
@@ -203,7 +207,7 @@ define SUMMARY_TEMPLATE
   $$(SUM_$(1)): P2 = $$(word 9, $$(C0))
   $$(SUM_$(1)): P3 = $$(shell echo "$$(P1)+$$(P2)"|bc)
 
-  $$(SUM_$(1)): $$(MAS_$(1)) $(1)/$(1)_probe.txt Makefile
+  $$(SUM_$(1)): $$(MAS_$(1)) $(1)/probe.txt Makefile
 	@printf '  SUMMARY $(1)\n'
 	@printf 'name "$$(basename $$(@F))"\n\n'                        >  $$@
 	@printf 'table {\n'                                             >> $$@
@@ -239,6 +243,10 @@ endif
 
 tbls: $(SUMS)
 
+# odeps ######################################################################
+
+odeps: $(PACKAGES:%=%/deps.txt)
+
 # trim #######################################################################
 
 TRIMS := $(MAS) $(TBLS) $(LDWS)
@@ -252,8 +260,8 @@ trim: $(TRIMS:%=%.trimmed)
 # contrib ####################################################################
 
 contrib:
-	@echo "  TAR -czf $(CONTRIB).tar.gz root $(XPACKAGES)"
-	$(H)tar -czf $(CONTRIB).tar.gz root $(XMAS)
+	@echo "  TAR -cjf $(CONTRIB).tar.bz2 root $(XPACKAGES)"
+	$(H)tar -cjf $(CONTRIB).tar.bz2 ../lambdadelta/root $(XMAS:%=../lambdadelta/%)
 
 # clean ######################################################################
 
@@ -262,13 +270,13 @@ clean:
 
 # www ######################################################################
 
-www:
-	$(H)$(MAKE) --no-print-directory -C $(WWW) www
+home:
+	$(H)$(MAKE) --no-print-directory -C $(WWW) home
 
 # www ######################################################################
 
-up-html:
-	$(H)$(MAKE) --no-print-directory -C $(WWW) up-html
+up-home:
+	$(H)$(MAKE) --no-print-directory -C $(WWW) up-home
 
 ##############################################################################