more work, but russell too slow

[helm.git] / helm / software / matita / Makefile

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index 6199bd5aa9f3fada1d48799495d8e92b6ec21ade..eae880741196cf2a8619935565e490613928641e 100644 (file)
--- a/helm/software/matita/Makefile
+++ b/helm/software/matita/Makefile
@@ -183,7 +183,8 @@ TEST_DIRS =                                 \
        legacy                          \
        library                         \
        tests                           \
-       dama                            \
+       contribs/dama/dama              \
+       contribs/assembly               \
        contribs/CoRN                   \
        contribs/RELATIONAL             \
        contribs/LOGIC                  \
@@ -216,14 +217,13 @@ cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt)
 ifeq ($(DISTRIBUTED),yes)
 
 
-dist_library: install_preliminaries dist_library@library
-dist_library@%: 
-       $(H)echo "depend $*"
-       $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitadep)
-       $(H)echo "publish $*"
-       $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitac -system -noinnertypes)
-       $(H)echo "destroy $*"
-       $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitaclean)
+dist_library: install_preliminaries 
+       $(H)echo "depend"
+       $(H)cd $(WHERE)/ma/standard-library;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitadep)
+       $(H)echo "publish"
+       $(H)cd $(WHERE)/ma/standard-library;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitac -system -noinnertypes)
+       $(H)echo "destroy"
+       $(H)cd $(WHERE)/ma/standard-library;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitaclean)
        # sqlite3 only
        $(H)cp $(WHERE)/.matita/matita.db  $(WHERE)/metadata.db || true
        #$(H)rm -rf $(WHERE)/.matita/
@@ -276,7 +276,6 @@ endif
                ln -fs matita $(WHERE)/$$p;\
        done
        $(H)cp -a library/ $(WHERE)/ma/standard-library
-       $(H)M=$$PWD/matitadep cd $(WHERE)/ma/standard-library; $$M
 
        $(H)touch install_preliminaries.stamp