beginning to see the light

[helm.git] / matita / Makefile

diff --git a/matita/Makefile b/matita/Makefile
index 2aef5b8fa3b4870f12195cc1cb020d7cb88ba44d..97d74fdc4b1662661f02d006ca9ca40f429f676b 100644 (file)
--- a/matita/Makefile
+++ b/matita/Makefile
@@ -18,8 +18,8 @@ OCAMLC = $(OCAMLFIND) ocamlc$(OCAML_PROF) $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS)
 OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS) $(OCAMLOPT_DEBUG_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAMLDEP_FLAGS)
 INSTALL_PROGRAMS= matita matitac
-INSTALL_PROGRAMS_LINKS_MATITA= cicbrowser 
-INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitamake matitaclean matitaprover matitawiki
+INSTALL_PROGRAMS_LINKS_MATITA= 
+INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitaclean matitawiki
 
 MATITA_FLAGS = -noprofile
 NODB=false
@@ -28,41 +28,33 @@ ifeq ($(NODB),true)
 endif
 
 MLI = \
-        make.mli               \
        lablGraphviz.mli        \
        matitaTypes.mli         \
        matitaMisc.mli          \
-       matitamakeLib.mli       \
-       matitaExcPp.mli         \
-       matitaInit.mli          \
        matitaEngine.mli        \
+       matitaExcPp.mli         \
        applyTransformation.mli \
-       matitaAutoGui.mli       \
        matitacLib.mli          \
-       matitaprover.mli        \
+       matitaInit.mli          \
+       matitaAutoGui.mli       \
        matitaGtkMisc.mli       \
        matitaScript.mli        \
        matitaMathView.mli      \
        matitaGui.mli           \
        $(NULL)
 CMLI =                         \
-        make.mli               \
        matitaTypes.mli         \
        matitaMisc.mli          \
-       matitamakeLib.mli       \
-       matitaExcPp.mli         \
-       matitaInit.mli          \
        matitaEngine.mli        \
+       matitaExcPp.mli         \
        applyTransformation.mli \
        matitacLib.mli          \
+       matitaInit.mli          \
        matitaWiki.mli          \
-       matitaprover.mli        \
        $(NULL)
 MAINCMLI =                     \
        matitadep.mli           \
        matitaclean.mli         \
-       matitamake.mli          \
-       gragrep.mli             \
        $(NULL)
 # objects for matita (GTK GUI)
 ML = buildTimeConf.ml matitaGeneratedGui.ml $(MLI:%.mli=%.ml)
@@ -71,11 +63,11 @@ CML = buildTimeConf.ml $(CMLI:%.mli=%.ml)
 MAINCML = $(MAINCMLI:%.mli=%.ml)
        
 PROGRAMS_BYTE = \
-       matita matitac cicbrowser matitadep matitaclean \
-       matitamake matitaprover matitawiki
+       matita matitac matitadep matitaclean \
+       matitawiki
 PROGRAMS = $(PROGRAMS_BYTE) 
 PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS_BYTE))
-NOINST_PROGRAMS = dump_moo gragrep
+NOINST_PROGRAMS = dump_moo 
 NOINST_PROGRAMS_OPT = $(patsubst %,%.opt,$(EXTRA_PROGRAMS))
 
 .PHONY: all
@@ -115,9 +107,9 @@ links:
 
 linkonly:
        $(H)echo "  OCAMLC matita.ml"
-       $(H)$(OCAMLC) $(PKGS) -linkpkg -o matita $(CMOS) matita.ml
+       $(H)$(OCAMLC) $(PKGS) -linkpkg -o matita $(CMOS) $(OCAML_DEBUG_FLAGS) matita.ml
        $(H)echo "  OCAMLC matitac.ml"
-       $(H)$(OCAMLC) $(CPKGS) -linkpkg -o matitac $(CCMOS) $(MAINCMOS) matitac.ml
+       $(H)$(OCAMLC) $(CPKGS) -linkpkg -o matitac $(CCMOS) $(MAINCMOS) $(OCAML_DEBUG_FLAGS) matitac.ml
 .PHONY: linkonly
 matita: matita.ml $(LIB_DEPS) $(CMOS)
        $(H)echo "  OCAMLC $<"
@@ -149,11 +141,6 @@ rottener.opt: rottener.ml $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS)
 clean-rottened:
        find . -type f -name "*.ma.*.rottened" -exec rm {} \;
 
-matitaprover: matitac
-       $(H)test -f $@ || ln -s $< $@
-matitaprover.opt: matitac.opt
-       $(H)test -f $@ || ln -s $< $@
-
 matitadep: matitac
        $(H)test -f $@ || ln -s $< $@
 matitadep.opt: matitac.opt
@@ -169,21 +156,6 @@ matitaclean: matitac
 matitaclean.opt: matitac.opt
        $(H)test -f $@ || ln -s $< $@
 
-matitamake: matitac
-       $(H)test -f $@ || ln -s $< $@
-matitamake.opt: matitac.opt
-       $(H)test -f $@ || ln -s $< $@
-       
-gragrep: matitac
-       $(H)test -f $@ || ln -s $< $@
-gragrep.opt: matitac.opt
-       $(H)test -f $@ || ln -s $< $@
-       
-cicbrowser: matita
-       $(H)test -f $@ || ln -s $< $@
-cicbrowser.opt: matita.opt
-       $(H)test -f $@ || ln -s $< $@
-
 matitaGeneratedGui.ml: matita.glade
        $(H)$(LABLGLADECC) -embed $< > matitaGeneratedGui.ml
 
@@ -244,14 +216,14 @@ cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt)
 ifeq ($(DISTRIBUTED),yes)
 
 
-dist_library: install_preliminaries dist_library@standard-library
+dist_library: install_preliminaries dist_library@library
 dist_library@%: 
-       $(H)echo "MATITAMAKE init $*"
-       $(H)(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitamake init $* $(WHERE)/ma/$*)
-       $(H)echo "MATITAMAKE publish $*"
-       $(H)(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitamake publish $*)
-       $(H)echo "MATITAMAKE destroy $*"
-       $(H)(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitamake destroy $*)
+       $(H)echo "depend $*"
+       $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitadep)
+       $(H)echo "publish $*"
+       $(H)cd $*;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitac -system -noinnertypes)
+       $(H)echo "destroy $*"
+       $(H)cd $*;(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/
@@ -273,7 +245,6 @@ INSTALL_STUFF =                     \
        matita.conf.xml                 \
        closed.xml                      \
        gtkmathview.matita.conf.xml     \
-       template_makefile.in            \
        AUTHORS                         \
        LICENSE                         \
        $(NULL)
@@ -367,23 +338,12 @@ matitac.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitac.ml
                $(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitac.ml \
                $(STATIC_EXTRA_CLIBS)
        strip $@
-matitaprover.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitac.ml
-       $(STATIC_LINK) $(STATIC_CLIBS_PROVER) -- \
-               $(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 $< $@
-matitamake.opt.static: matitac.opt.static
-       $(H)test -f $@ || ln -s $< $@
-cicbrowser.opt.static: matita.opt.static
-       $(H)test -f $@ || ln -s $< $@
-cicbrowser.opt.static.upx: matita.opt.static.upx
-       $(H)test -f $@ || ln -s $< $@
 
 %.upx: %
        cp $< $@