X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FMakefile;h=bc317b4f3a37997e67b241e3443b7d85841265d5;hb=02763a89e6351dfb7770251d0507512e3f0ddb74;hp=97d74fdc4b1662661f02d006ca9ca40f429f676b;hpb=5c1b44dfefa085fbb56e23047652d3650be9d855;p=helm.git

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index 97d74fdc4..bc317b4f3 100644
--- 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,17 +183,18 @@ 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)                    \
+	contribs/LAMBDA-TYPES 		\
 	$(NULL)
 
 .PHONY: tests tests.opt cleantests cleantests.opt
@@ -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,7 @@ endif
 		ln -fs matita $(WHERE)/$$p;\
 	done
 	$(H)cp -a library/ $(WHERE)/ma/standard-library
-	#$(H)cp -a contribs/ $(WHERE)/ma/
+
 	$(H)touch install_preliminaries.stamp
 
 uninstall: