X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FMakefile;h=0271b714a5566704a599af382be964fb34532b89;hb=2914bfbeac3c2e0f53ba8c612cd11b3b2afbabce;hp=fcf51b5d05f46ffc252d9b8eaad6a8c3ddb8d6b1;hpb=2c01ff6094173915e7023076ea48b5804dca7778;p=helm.git

diff --git a/matita/matita/Makefile b/matita/matita/Makefile
index fcf51b5d0..0271b714a 100644
--- a/matita/matita/Makefile
+++ b/matita/matita/Makefile
@@ -25,7 +25,7 @@ OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS) $(OCAMLOPT_DEBUG_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAMLDEP_FLAGS)
 INSTALL_PROGRAMS= matita matitac
 INSTALL_PROGRAMS_LINKS_MATITA= 
-INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitaclean matitawiki
+INSTALL_PROGRAMS_LINKS_MATITAC= matitaclean
 
 MATITA_FLAGS = -noprofile
 NODB=false
@@ -40,14 +40,13 @@ MLI = \
 	applyTransformation.mli	\
 	matitaEngine.mli	\
 	matitaExcPp.mli 	\
-	matitacLib.mli		\
 	matitaInit.mli		\
 	matitaGtkMisc.mli	\
-	matitaAutoGui.mli	\
 	virtuals.mli 		\
-	matitaScript.mli	\
+	cicMathView.mli 	\
 	predefined_virtuals.mli \
 	matitaMathView.mli 	\
+	matitaScript.mli	\
 	matitaGui.mli		\
 	$(NULL)
 CMLI =				\
@@ -56,12 +55,9 @@ CMLI =				\
 	applyTransformation.mli	\
 	matitaEngine.mli	\
 	matitaExcPp.mli 	\
-	matitacLib.mli		\
 	matitaInit.mli		\
-	matitaWiki.mli		\
 	$(NULL)
 MAINCMLI =			\
-	matitadep.mli		\
 	matitaclean.mli		\
 	$(NULL)
 # objects for matita (GTK GUI)
@@ -71,11 +67,10 @@ CML = buildTimeConf.ml $(CMLI:%.mli=%.ml)
 MAINCML = $(MAINCMLI:%.mli=%.ml)
 
 PROGRAMS_BYTE = \
-	matita matitac matitadep matitaclean \
-	matitawiki
+	matita matitac matitaclean
 PROGRAMS = $(PROGRAMS_BYTE) 
 PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS_BYTE))
-NOINST_PROGRAMS = dump_moo 
+NOINST_PROGRAMS =
 NOINST_PROGRAMS_OPT = $(patsubst %,%.opt,$(EXTRA_PROGRAMS))
 
 .PHONY: all
@@ -126,13 +121,6 @@ matita.opt: matita.ml $(LIBX_DEPS) $(CMXS)
 	$(H)echo "  OCAMLOPT $<"
 	$(H)$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml
 
-dump_moo: dump_moo.ml buildTimeConf.cmo
-	$(H)echo "  OCAMLC $<"
-	$(H)$(OCAMLC) $(PKGS) -linkpkg -o $@ buildTimeConf.cmo $<
-dump_moo.opt: dump_moo.ml buildTimeConf.cmx
-	$(H)echo "OCAMLOPT $<"
-	$(H)$(OCAMLOPT) $(PKGS) -linkpkg -o $@ buildTimeConf.cmx $<
-
 matitac: matitac.ml $(CLIB_DEPS) $(CCMOS) $(MAINCMOS)
 	$(H)echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(CPKGS) -linkpkg -o $@ $(CCMOS) $(MAINCMOS) matitac.ml
@@ -149,24 +137,17 @@ rottener.opt: rottener.ml $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS)
 clean-rottened:
 	find . -type f -name "*.ma.*.rottened" -exec rm {} \;
 
-matitadep: matitac
-	$(H)test -f $@ || ln -s $< $@
-matitadep.opt: matitac.opt
-	$(H)test -f $@ || ln -s $< $@
-
-matitawiki: matitac
-	$(H)test -f $@ || ln -s $< $@
-matitawiki.opt: matitac.opt
-	$(H)test -f $@ || ln -s $< $@
-
 matitaclean: matitac
 	$(H)test -f $@ || ln -s $< $@
 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 \
@@ -212,9 +193,9 @@ tests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-test-opt)
 cleantests: $(foreach d,$(TEST_DIRS),$(d)-cleantests)
 cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt)
 
-%-test: matitac matitadep matitaclean 
+%-test: matitac matitaclean 
 	-cd $* && make -k clean all
-%-test-opt: matitac.opt matitadep.opt matitaclean.opt
+%-test-opt: matitac.opt matitaclean.opt
 	-cd $* && make -k clean.opt opt
 %-cleantests: matitaclean
 	-cd $* && make clean
@@ -227,8 +208,6 @@ ifeq ($(DISTRIBUTED),yes)
 
 
 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"
@@ -338,22 +317,13 @@ matita.opt.static: $(STATIC_LINK) $(LIBX_DEPS) $(CMXS) matita.ml
 		$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml \
 		$(STATIC_EXTRA_LIBS)
 	strip $@
-dump_moo.opt.static: $(STATIC_LINK) buildTimeConf.cmx dump_moo.ml
-	$(STATIC_LINK) $(STATIC_CLIBS) -- \
-		$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $^ \
-		$(STATIC_EXTRA_CLIBS)
-	strip $@
 matitac.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitac.ml
 	$(STATIC_LINK) $(STATIC_CLIBS) -- \
 		$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitac.ml \
 		$(STATIC_EXTRA_CLIBS)
 	strip $@
-matitadep.opt.static: matitac.opt.static
-	$(H)test -f $@ || ln -s $< $@
 matitaclean.opt.static: matitac.opt.static
 	$(H)test -f $@ || ln -s $< $@
-matitawiki.opt.static: matitac.opt.static
-	$(H)test -f $@ || ln -s $< $@
 
 %.upx: %
 	cp $< $@