X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FMakefile;h=210920abe280e144ba9e1f864479bbb6f90f017d;hb=f34f2623a3133e235331d0c0c1830ec213dd09f1;hp=caf0f82ff4c7a682ff9f25485f8a312c7da85413;hpb=7e6fea0332e132a8cb89c689ba68c5e884c4354c;p=helm.git

diff --git a/matita/matita/Makefile b/matita/matita/Makefile
index caf0f82ff..210920abe 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 -52
 OCAMLDEP_FLAGS = -pp $(CAMLP5O) 
 PKGS = -package "$(MATITA_REQUIRES)"
 CPKGS = -package "$(MATITA_CREQUIRES)"
@@ -61,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)
@@ -142,11 +142,10 @@ matitaclean: matitac
 matitaclean.opt: matitac.opt
 	$(H)test -f $@ || ln -s $< $@
 
-matitaGeneratedGui.ml: matita.glade.utf8
-	$(H)$(LABLGLADECC) -embed $< > matitaGeneratedGui.ml
+matitaGeneratedGui.ml: matita.ui
+	#$(H)$(LABLGLADECC) -embed $< > matitaGeneratedGui.ml
+	$(H)$(LABLGLADECC) $< > matitaGeneratedGui.ml
 
-matita.glade.utf8: matita.glade
-	$(H)xmllint --encode UTF8 $< > $@
 
 .PHONY: clean
 clean:
@@ -162,7 +161,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
@@ -204,7 +202,7 @@ cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt)
 
 # {{{ Distribution stuff
 
-dist_pre: matitaGeneratedGui.ml
+dist_pre:
 	$(MAKE) -C dist/ dist_pre
 
 WHERE = $(DESTDIR)/$(RT_BASE_DIR)