X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FMakefile;h=d40a15c7a6eb5d4286d2ecae4d01fd1ce6dd6188;hb=1aca50505c3ce6c76dd7d20d00e358707caffd4a;hp=2f50ce4d5a2f5787f9eabbaec4c466f3964b393b;hpb=7be382111340d6240b45e95126c7844134272b41;p=helm.git

diff --git a/matita/matita/Makefile b/matita/matita/Makefile
index 2f50ce4d5..d40a15c7a 100644
--- a/matita/matita/Makefile
+++ b/matita/matita/Makefile
@@ -11,7 +11,7 @@ else
   ANNOTOPTION =
 endif
 
-OCAML_FLAGS = -pp $(CAMLP5O) -rectypes $(ANNOTOPTION) 
+OCAML_FLAGS = -pp $(CAMLP5O) -rectypes $(ANNOTOPTION) -w @A-52-4-34-37-45-9-44-48-6-32-20-58-7
 OCAMLDEP_FLAGS = -pp $(CAMLP5O) 
 PKGS = -package "$(MATITA_REQUIRES)"
 CPKGS = -package "$(MATITA_CREQUIRES)"
@@ -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 =				\
@@ -60,7 +61,7 @@ MAINCMLI =			\
 	matitaclean.mli		\
 	$(NULL)
 # objects for matita (GTK GUI)
-ML = buildTimeConf.ml matitaGeneratedGui.ml $(MLI:%.mli=%.ml)
+ML = buildTimeConf.ml matitaGuiInit.ml matitaGeneratedGui.ml $(MLI:%.mli=%.ml)
 # objects for matitac (batch compiler)
 CML = buildTimeConf.ml $(CMLI:%.mli=%.ml)
 MAINCML = $(MAINCMLI:%.mli=%.ml)
@@ -141,11 +142,9 @@ matitaclean: matitac
 matitaclean.opt: matitac.opt
 	$(H)test -f $@ || ln -s $< $@
 
-matitaGeneratedGui.ml: matita.glade.utf8
+matitaGeneratedGui.ml: matita.ui
 	$(H)$(LABLGLADECC) -embed $< > matitaGeneratedGui.ml
 
-matita.glade.utf8: matita.glade
-	$(H)xmllint --encode UTF8 $< > $@
 
 .PHONY: clean
 clean:
@@ -161,7 +160,6 @@ clean:
 .PHONY: distclean
 distclean: clean
 	$(H)$(MAKE) -C dist/ clean
-	$(H)rm -f matitaGeneratedGui.ml matitaGeneratedGui.mli
 	$(H)rm -f buildTimeConf.ml
 	$(H)rm -f matita.glade.bak matita.gladep.bak
 	$(H)rm -f matita.conf.xml.sample
@@ -203,22 +201,7 @@ 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
+dist_pre:
 	$(MAKE) -C dist/ dist_pre
 
 WHERE = $(DESTDIR)/$(RT_BASE_DIR)
@@ -228,10 +211,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)
@@ -262,8 +243,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