X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FMakefile;h=caf0f82ff4c7a682ff9f25485f8a312c7da85413;hb=4738096e93f997fb36d35dd723b87682a2f6de90;hp=b269bd04a57603017b4aaec4184503c6f0049c13;hpb=d8c17db3c787f3ea964bbcd3b27427ca44b356d0;p=helm.git

diff --git a/matita/matita/Makefile b/matita/matita/Makefile
index b269bd04a..caf0f82ff 100644
--- a/matita/matita/Makefile
+++ b/matita/matita/Makefile
@@ -43,9 +43,10 @@ MLI = \
 	matitaInit.mli		\
 	matitaGtkMisc.mli	\
 	virtuals.mli 		\
-	matitaScript.mli	\
+	cicMathView.mli 	\
 	predefined_virtuals.mli \
 	matitaMathView.mli 	\
+	matitaScript.mli	\
 	matitaGui.mli		\
 	$(NULL)
 CMLI =				\
@@ -141,9 +142,12 @@ matitaclean: matitac
 matitaclean.opt: matitac.opt
 	$(H)test -f $@ || ln -s $< $@
 
-matitaGeneratedGui.ml: matita.glade
+matitaGeneratedGui.ml: matita.glade.utf8
 	$(H)$(LABLGLADECC) -embed $< > matitaGeneratedGui.ml
 
+matita.glade.utf8: matita.glade
+	$(H)xmllint --encode UTF8 $< > $@
+
 .PHONY: clean
 clean:
 	$(H)rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o \
@@ -200,21 +204,6 @@ cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt)
 
 # {{{ Distribution stuff
 
-ifeq ($(DISTRIBUTED),yes)
-
-
-dist_library: install_preliminaries 
-	$(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/
-	touch $@
-
-endif
-
 dist_pre: matitaGeneratedGui.ml
 	$(MAKE) -C dist/ dist_pre
 
@@ -225,10 +214,8 @@ INSTALL_STUFF = 			\
 	matita.gtkrc 			\
 	matita.lang 			\
 	matita.ma.templ 		\
-	core_notation.moo 		\
 	matita.conf.xml 		\
 	closed.xml 			\
-	gtkmathview.matita.conf.xml 	\
 	AUTHORS 			\
 	LICENSE 			\
 	$(NULL)
@@ -259,8 +246,7 @@ endif
 	$(H)for p in $(INSTALL_PROGRAMS_LINKS_MATITA); do \
 		ln -fs matita $(WHERE)/$$p;\
 	done
-	$(H)cp -a library/ $(WHERE)/ma/standard-library
-	$(H)cp -a nlibrary/ $(WHERE)/ma/new-standard-library
+	$(H)cp -a lib $(WHERE)/lib
 
 	$(H)touch install_preliminaries.stamp