update in basic_2

[helm.git] / matita / matita / Makefile

diff --git a/matita/matita/Makefile b/matita/matita/Makefile
index 6dd65b61695fca6ff64752374ce4f5143a828b28..caf0f82ff4c7a682ff9f25485f8a312c7da85413 100644 (file)
--- 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
+INSTALL_PROGRAMS_LINKS_MATITAC= matitaclean
 
 MATITA_FLAGS = -noprofile
 NODB=false
@@ -38,26 +38,26 @@ MLI = \
        matitaTypes.mli         \
        matitaMisc.mli          \
        applyTransformation.mli \
-       matitaExcPp.mli         \
        matitaEngine.mli        \
+       matitaExcPp.mli         \
        matitaInit.mli          \
        matitaGtkMisc.mli       \
        virtuals.mli            \
-       matitaScript.mli        \
+       cicMathView.mli         \
        predefined_virtuals.mli \
        matitaMathView.mli      \
+       matitaScript.mli        \
        matitaGui.mli           \
        $(NULL)
 CMLI =                         \
        matitaTypes.mli         \
        matitaMisc.mli          \
        applyTransformation.mli \
-       matitaExcPp.mli         \
        matitaEngine.mli        \
+       matitaExcPp.mli         \
        matitaInit.mli          \
        $(NULL)
 MAINCMLI =                     \
-       matitadep.mli           \
        matitaclean.mli         \
        $(NULL)
 # objects for matita (GTK GUI)
@@ -67,7 +67,7 @@ CML = buildTimeConf.ml $(CMLI:%.mli=%.ml)
 MAINCML = $(MAINCMLI:%.mli=%.ml)
 
 PROGRAMS_BYTE = \
-       matita matitac matitadep matitaclean
+       matita matitac matitaclean
 PROGRAMS = $(PROGRAMS_BYTE) 
 PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS_BYTE))
 NOINST_PROGRAMS =
@@ -137,19 +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 $< $@
-
 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 \
@@ -195,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
@@ -206,23 +204,6 @@ cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt)
 
 # {{{ Distribution stuff
 
-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"
-       $(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
 
@@ -233,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)
@@ -267,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
 
@@ -326,8 +304,6 @@ matitac.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitac.ml
                $(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 $< $@