- lsubsx (replacement of lcosx) completed

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

diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile
index 9de41db0c3f3f4fad5cc8c03a7e726c538f3ad24..6bb4350829abcfefd3ce85cf91b5d5b89cbe26e5 100644 (file)
--- a/matita/matita/contribs/lambdadelta/Makefile
+++ b/matita/matita/contribs/lambdadelta/Makefile
@@ -4,14 +4,14 @@ 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_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/notation/xoa2_notation.ma ground_2/xoa/xoa2.ma
+XOA2_TARGETS := ground_2/notation/xoa/notation2.ma ground_2/xoa/xoa2.ma
 XOA2_OPTS    := ../../matita.conf.xml $(XOA2_CONF)
 
 DEP_INPUT    := .depend
@@ -91,9 +91,12 @@ orig: $(ORIGS)
 
 # dep input ##################################################################
 
-$(DEP_INPUT): $(MAS)
+$(DEP_INPUT): LINE = $(MAS:%=%:include \"\".)
+
+$(DEP_INPUT): $(MAS) Makefile
        @echo "  GREP include"
        $(H)grep "include \"" $^ > $(DEP_INPUT)
+       $(H)echo "$(LINE)" | sed -e 's/\"\. /\"\.\n/g' >> $(DEP_INPUT) 
 
 # dep ########################################################################
 
@@ -201,20 +204,20 @@ define SUMMARY_TEMPLATE
        @printf '  SUMMARY $(1)\n'
        @printf 'name "$$(basename $$(@F))"\n\n'                  >  $$@
        @printf 'table {\n'                                       >> $$@
-       @printf '   class "gray"   [ "category"\n'                >> $$@
+       @printf '   class "gray"  [ "category"\n'                 >> $$@
        @printf '      [ "objects" * ]\n'                         >> $$@
        @printf '   ]\n'                                          >> $$@
-       @printf '   class "cyan"   [ "sizes"\n'                   >> $$@
+       @printf '   class "water" [ "sizes"\n'                    >> $$@
        @printf '      [ "files"      "$$(S1)" ]\n'               >> $$@
        @printf '      [ "characters" "$$(S2)" ]\n'               >> $$@
        @printf '      [ "nodes"      "$$(S4)" ]\n'               >> $$@
        @printf '   ]\n'                                          >> $$@        
-       @printf '   class "green"  [ "propositions"\n'            >> $$@
+       @printf '   class "green" [ "propositions"\n'             >> $$@
        @printf '      [ "theorems" "$$(P1)" ]\n'                 >> $$@
        @printf '      [ "lemmas"   "$$(P2)" ]\n'                 >> $$@
        @printf '      [ "total"    "$$(P3)" ]\n'                 >> $$@
        @printf '   ]\n'                                          >> $$@
-       @printf '   class "yellow" [ "concepts"\n'                >> $$@
+       @printf '   class "grass" [ "concepts"\n'                 >> $$@
        @printf '      [ "declared" "$$(C1)" ]\n'                 >> $$@
        @printf '      [ "defined"  "$$(C2)" ]\n'                 >> $$@
        @printf '      [ "total"    "$$(C3)" ]\n'                 >> $$@