updated probe and matitadep

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

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index 0c03faa0ce0328d5f6e9e5b299b0a2c619da1efa..dd955bcc233944487ee9c20cc2c53003194fe021 100644 (file)
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -32,8 +32,8 @@ WWW          := ../../../../helm/www/lambdadelta
 TAGS := all xoa xoa2 orig elim deps top leaf stats tbls trim contrib clean \
         www up-html
 
-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")
@@ -50,7 +50,8 @@ define MAS_TEMPLATE
 
 $(1)/$(1)_probe.txt: $$(MAS_$(1))
        @echo "  PROBE $(1)"
-       $$(H)$$(PRB_DIR)/$$(PRB) $$(PRB_OPTS) $(1) -sn -sc -on -oc -f > $$@
+       $$(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
 endef
 
 $(foreach PKG, $(PACKAGES), $(eval $(call MAS_TEMPLATE,$(PKG))))
@@ -95,26 +96,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 ######################################################################