cicDischarge: we still have some problems here. Some fixes

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

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index b593d505d47195c90f712a38445a6d7ab7247c7b..41590525815a2fbb3f4293e9831a41d6a7c3acaa 100644 (file)
--- a/helm/software/matita/Makefile
+++ b/helm/software/matita/Makefile
@@ -36,8 +36,8 @@ MLI = \
        applyTransformation.mli \
        matitacLib.mli          \
        matitaInit.mli          \
-       matitaAutoGui.mli       \
        matitaGtkMisc.mli       \
+       matitaAutoGui.mli       \
        matitaScript.mli        \
        matitaMathView.mli      \
        matitaGui.mli           \
@@ -183,18 +183,19 @@ TEST_DIRS =                               \
        legacy                          \
        library                         \
        tests                           \
-       dama                            \
+       contribs/dama/dama              \
+       contribs/assembly               \
        contribs/CoRN                   \
        contribs/RELATIONAL             \
        contribs/LOGIC                  \
-       contribs/LAMBDA-TYPES           \
        contribs/PREDICATIVE-TOPOLOGY   \
        $(NULL)
 
 #      library_auto                    
 TEST_DIRS_OPT =                        \
-       $(TEST_DIRS)        \
+       $(TEST_DIRS)                    \
        $(NULL)
+       #contribs/LAMBDA-TYPES          \
 
 .PHONY: tests tests.opt cleantests cleantests.opt
 tests: $(foreach d,$(TEST_DIRS),$(d)-test)
@@ -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/