Porting to ocaml 5

[helm.git] / matita / matita / Makefile

diff --git a/matita/matita/Makefile b/matita/matita/Makefile
index 0271b714a5566704a599af382be964fb34532b89..5276991102b4fffba0074c09f08839a9c9f3092d 100644 (file)
--- a/matita/matita/Makefile
+++ b/matita/matita/Makefile
@@ -11,7 +11,8 @@ 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-70-31
+OCAML_FLAGS = -rectypes $(ANNOTOPTION) -w @A-52-4-34-37-45-9-44-48-6-32-20-58-7-70-31-29
 OCAMLDEP_FLAGS = -pp $(CAMLP5O) 
 PKGS = -package "$(MATITA_REQUIRES)"
 CPKGS = -package "$(MATITA_CREQUIRES)"
@@ -61,7 +62,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 +143,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:
@@ -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,22 +202,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)
@@ -229,10 +212,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)
@@ -263,8 +244,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