X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2FMakefile;h=34dd97cd5d86a80ed0c893874ed90962c3603037;hb=3b7b8afcb429a60d716d5226a5b6ab0d003228b1;hp=0c03faa0ce0328d5f6e9e5b299b0a2c619da1efa;hpb=58ede527a29e92f47321820421a3d8d0735daad8;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index 0c03faa0c..34dd97cd5 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
@@ -25,15 +20,15 @@ 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 orig elim deps top leaf stats tbls odeps trim contrib clean \
+        home up-home
 
-PACKAGES  := ground_2 basic_2 apps_2 alpha_1
-XPACKAGES := ground_2 basic_2
+PACKAGES  := ground_2 static_2 basic_2 apps_2 alpha_1
+XPACKAGES := ground_2 static_2 basic_2
 
 LDWS := $(shell find -name "*.ldw.xml")
 TBLS := $(shell find -name "*.tbl")
@@ -48,9 +43,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 > $$@
+
+$(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))))
@@ -65,17 +65,9 @@ $(foreach PKG, $(XPACKAGES), $(eval $(call XMAS_TEMPLATE,$(PKG))))
 
 # xoa ########################################################################
 
-xoa: $(XOA_TARGETS)
-
-$(XOA_TARGETS): $(XOA_CONF)
+xoa: $(XOA_CONF)
 	@echo "  EXEC $(XOA) $(XOA_CONF)"
-	$(H)$(XOA_DIR)/$(XOA) $(XOA_OPTS)
-
-# xoa2 #######################################################################
-
-xoa2: $(XOA2_CONF)
-	@echo "  EXEC $(XOA) $(XOA2_CONF)"
-	$(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) -s $(XOA2_OPTS)
+	$(H)MATITA_RT_BASE_DIR=../.. $(XOA_DIR)/$(XOA) -s $(XOA_OPTS)
 
 # elim #######################################################################
 
@@ -95,26 +87,26 @@ $(DEP_INPUT): LINE = $(MAS:%=%:include \"\".)
 
 $(DEP_INPUT): $(MAS) Makefile
 	@echo "  GREP include"
-	$(H)grep "include \"" $^ > $(DEP_INPUT)
+	$(H)grep "include \"" $(MAS) > $(DEP_INPUT)
 	$(H)echo "$(LINE)" | sed -e 's/\"\. /\"\.\n/g' >> $(DEP_INPUT) 
 
 # dep ########################################################################
 
 deps: $(DEP_INPUT)
 	@echo "  MATITADEP -c"
-	$(H)$(DEP_DIR)/$(DEP) -c $(DEP_OPTS) < $<
+	$(H)$(DEP_DIR)/$(DEP) -c $(DEP_OPTS) $<
 
 # top ########################################################################
 
 top: $(DEP_INPUT)
 	@echo "  MATITADEP -t"
-	$(H)$(DEP_DIR)/$(DEP) -t $(DEP_OPTS) < $<
+	$(H)$(DEP_DIR)/$(DEP) -t $(DEP_OPTS) $<
 
 # leaf #######################################################################
 
 leaf: $(DEP_INPUT)
 	@echo "  MATITADEP -l"
-	$(H)$(DEP_DIR)/$(DEP) -l $(DEP_OPTS) < $<
+	$(H)$(DEP_DIR)/$(DEP) -l $(DEP_OPTS) $<
 
 # stats ######################################################################
 
@@ -122,7 +114,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)
@@ -139,7 +131,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'
@@ -186,10 +178,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))
@@ -202,7 +194,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'                                             >> $$@
@@ -238,6 +230,10 @@ endif
 
 tbls: $(SUMS)
 
+# odeps ######################################################################
+
+odeps: $(PACKAGES:%=%/deps.txt)
+
 # trim #######################################################################
 
 TRIMS := $(MAS) $(TBLS) $(LDWS)
@@ -251,8 +247,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 ######################################################################
 
@@ -261,13 +257,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
 
 ##############################################################################