X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2FMakefile;h=d08583562959e3dd9f0ef7c384138d58fa4aae45;hb=2c9f4fddc259b09b6e71b18eef78f0bed38eeb14;hp=e22b7ec42cbf59aba516a2299af4666adda02fb0;hpb=c7b50fec51b9a25d5bc536f44e54179fd53efb44;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index e22b7ec42..d08583562 100644
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -3,16 +3,11 @@ H    := @
 
 TRIM := sed "s/ \\+$$//"
 
-XOA_CONF     := ground_2/xoa.conf.xml
-XOA_TARGETS  := ground_2/notation/xoa/notation.ma ground_2/xoa/xoa.ma
-
 XOA_DIR      := ../../../components/binaries/xoa
 XOA          := xoa.native
+XOA_CONF     := ground_2/xoa.conf.xml
 XOA_OPTS     := ../../matita.conf.xml $(XOA_CONF)
 
-XOA2_CONF    := ground_2/xoa2.conf.xml
-XOA2_OPTS    := ../../matita.conf.xml $(XOA2_CONF)
-
 DEP_INPUT    := .depend
 DEP_DIR      := ../../../components/binaries/matitadep
 DEP          := matitadep.native
@@ -22,15 +17,15 @@ PRB_DIR      := ../../../components/binaries/probe
 PRB          := probe.native
 PRB_OPTS     := $(XOA_OPTS) -g -i
 
-ORIG         := . ./orig.sh 
+ORIG         := . ./orig.sh
 ORIGS        := basic_2/basic_1.orig
 
 CONTRIB      := lambdadelta_2B
 
 WWW          := ../../../../helm/www/lambdadelta
 
-TAGS := all xoa xoa2 orig elim deps top leaf stats tbls odeps trim contrib clean \
-        www up-html
+TAGS := all names xoa 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
@@ -68,19 +63,21 @@ endef
 
 $(foreach PKG, $(XPACKAGES), $(eval $(call XMAS_TEMPLATE,$(PKG))))
 
-# xoa ########################################################################
+# names ######################################################################
 
-xoa: $(XOA_TARGETS)
+NAMES = basic_1A basic_2A static_2 basic_2
 
-$(XOA_TARGETS): $(XOA_CONF)
-	@echo "  EXEC $(XOA) $(XOA_CONF)"
-	$(H)$(XOA_DIR)/$(XOA) $(XOA_OPTS)
+%/names.txt: %/*/*.ma
+	@echo "PROBE $* -ns"
+	$(H)$(PRB_DIR)/$(PRB) $(PRB_OPTS) $* -ns | sort > $@
+
+names: $(NAMES:%=%/names.txt)
 
-# xoa2 #######################################################################
+# xoa ########################################################################
 
-xoa2: $(XOA2_CONF)
-	@echo "  EXEC $(XOA) $(XOA2_CONF)"
-	$(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) -s $(XOA2_OPTS)
+xoa: $(XOA_CONF)
+	@echo "  EXEC $(XOA) $(XOA_CONF)"
+	$(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) -s $(XOA_OPTS)
 
 # elim #######################################################################
 
@@ -101,7 +98,7 @@ $(DEP_INPUT): LINE = $(MAS:%=%:include \"\".)
 $(DEP_INPUT): $(MAS) Makefile
 	@echo "  GREP include"
 	$(H)grep "include \"" $(MAS) > $(DEP_INPUT)
-	$(H)echo "$(LINE)" | sed -e 's/\"\. /\"\.\n/g' >> $(DEP_INPUT) 
+	$(H)echo "$(LINE)" | sed -e 's/\"\. /\"\.\n/g' >> $(DEP_INPUT)
 
 # dep ########################################################################
 
@@ -139,7 +136,7 @@ define STATS_TEMPLATE
   $$(STT_$(1)): P4 = $$(shell grep "qed[.-]" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): D1 = $$(word 5, $$(C0))
   $$(STT_$(1)): D2 = $$(word 7, $$(C0))
-  $$(STT_$(1)): D3 = $$(shell grep "defined[.-]" $$(MAS_$(1)) | wc -l)  
+  $$(STT_$(1)): D3 = $$(shell grep "defined[.-]" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M1 = $$(word 6, $$(C0))
   $$(STT_$(1)): M2 = $$(shell grep "$$(OPEN)\*[^*:]*$$$$" $$(MAS_$(1)) | wc -l)
   $$(STT_$(1)): M3 = $$(shell grep "(\*\*)" $$(MAS_$(1)) | wc -l)
@@ -149,7 +146,7 @@ $$(STT_$(1)): $$(MAS_$(1)) $(1)/probe.txt
 	@printf '%-15s %-46s' 'Statistics for:' $(1)
 	@printf '\x1B[0m\n'
 	@printf '\x1B[1;40;35m'
-	@printf '%-12s' '' 
+	@printf '%-12s' ''
 	@printf '   %-8s %6i' Chars $$(C2)
 	@printf '   %-7s %7i' Nodes $$(C3)
 	@printf '   %-11s' ''
@@ -261,7 +258,7 @@ trim: $(TRIMS:%=%.trimmed)
 
 contrib:
 	@echo "  TAR -cjf $(CONTRIB).tar.bz2 root $(XPACKAGES)"
-	$(H)tar -cjf $(CONTRIB).tar.bz2 root $(XMAS)
+	$(H)tar -cjf $(CONTRIB).tar.bz2 ../lambdadelta/root $(XMAS:%=../lambdadelta/%)
 
 # clean ######################################################################
 
@@ -270,13 +267,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
 
 ##############################################################################