release snapshot

[helm.git] / helm / matita / Makefile

diff --git a/helm/matita/Makefile b/helm/matita/Makefile
index 415d4a1a557488ac594162a4c21b34d67ad59a6a..75d8787808c055eedd68185baf1b467ae834e25f 100644 (file)
--- a/helm/matita/Makefile
+++ b/helm/matita/Makefile
@@ -59,32 +59,26 @@ PROGRAMS = $(PROGRAMS_BYTE) matitatop
 PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS_BYTE))
 
 .PHONY: all
-all: matita.conf.xml $(PROGRAMS) coq.moo
-
-matita.conf.xml: matita.conf.xml.sample
-       @if diff matita.conf.xml.sample matita.conf.xml 1>/dev/null 2>/dev/null; then\
-               touch matita.conf.xml;\
-       else\
-               echo;\
-               echo "matita.conf.xml.sample is newer than matita.conf.xml";\
-               echo;\
-               echo "PLEASE update your configuration file!";\
-               echo "(copying matita.conf.xml.sample should work)";\
-               echo;\
-               false;\
-       fi
-
-matita.conf.xml.sample: matita.conf.xml.sample.in
-       autoconf
-       ./configure
-       @echo 
-       @echo "WARNING: The configuration sample file has changed!"
-       @echo 
-
-coq.moo: library/legacy/coq.ma matitac
-       ./matitac $(MATITA_FLAGS) $<
-coq.moo.opt: library/legacy/coq.ma matitac.opt
-       ./matitac.opt $(MATITA_FLAGS) $<
+all: $(PROGRAMS)
+#  all: matita.conf.xml $(PROGRAMS) coq.moo
+
+#  matita.conf.xml: matita.conf.xml.sample
+#          @if diff matita.conf.xml.sample matita.conf.xml 1>/dev/null 2>/dev/null; then\
+#                  touch matita.conf.xml;\
+#          else\
+#                  echo;\
+#                  echo "matita.conf.xml.sample is newer than matita.conf.xml";\
+#                  echo;\
+#                  echo "PLEASE update your configuration file!";\
+#                  echo "(copying matita.conf.xml.sample should work)";\
+#                  echo;\
+#                  false;\
+#          fi
+
+#  coq.moo: library/legacy/coq.ma matitac
+#          ./matitac $(MATITA_FLAGS) $<
+#  coq.moo.opt: library/legacy/coq.ma matitac.opt
+#          ./matitac.opt $(MATITA_FLAGS) $<
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 
@@ -190,7 +184,7 @@ cleantests.opt: $(foreach d,$(TEST_DIRS),$(d)-cleantests-opt)
 
 # {{{ Distribution stuff
 
-ifeq ($(HAVE_OCAMLOPT),yes)
+ifeq ($(wildcard matitac.opt),matitac.opt)
 BEST=opt
 else
 BEST=all
@@ -198,7 +192,11 @@ endif
 
 stdlib:
        MATITA_RT_BASE_DIR=`pwd` \
-               $(MAKE) MATITA_FLAGS="-system" -C library/ $(BEST)
+       MATITA_FLAGS="-system -conffile `pwd`/matita.conf.xml.build" \
+               ./matitamake -init build_stdlib
+
+#          MATITA_RT_BASE_DIR=`pwd` \
+               $(MAKE) MATITA_FLAGS="-system -conffile `pwd`/matita.conf.xml.build" -C library/ $(BEST)
 
 DEST = @RT_BASE_DIR@
 INSTALL_STUFF =                        \
@@ -287,10 +285,9 @@ cicbrowser.opt.static.upx: matita.opt.static.upx
 distclean: clean
        $(MAKE) -C dist/ clean
        rm -f matitaGeneratedGui.ml matitaGeneratedGui.mli
-       rm -f config.log config.status Makefile buildTimeConf.ml
+       rm -f buildTimeConf.ml
        rm -f matita.glade.bak matita.gladep.bak
-       rm -rf autom4te.cache/
-       rm -f configure matita.conf.xml.sample
+       rm -f matita.conf.xml.sample
 
 %.upx: %
        cp $< $@