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)"
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= matita matitac matitaclean
INSTALL_PROGRAMS_LINKS_MATITA=
-INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitaclean matitawiki
+INSTALL_PROGRAMS_LINKS_MATITAC=
MATITA_FLAGS = -noprofile
NODB=false
MLI = \
lablGraphviz.mli \
matitaTypes.mli \
+ matitaMiscCli.mli \
matitaMisc.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 = \
matitaTypes.mli \
- matitaMisc.mli \
+ matitaMiscCli.mli \
applyTransformation.mli \
matitaEngine.mli \
matitaExcPp.mli \
- matitacLib.mli \
matitaInit.mli \
- matitaWiki.mli \
$(NULL)
MAINCMLI = \
- matitadep.mli \
- 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)
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
done
$(H)ln -sf matita.opt matita
$(H)ln -sf matitac.opt matitac
+ $(H)ln -sf matitaclean.opt matitaclean
linkonly:
$(H)echo " OCAMLC 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) $(OCAML_DEBUG_FLAGS) matitac.ml
+ $(H)echo " OCAMLC matitaclean.ml"
+ $(H)$(OCAMLC) $(CPKGS) -linkpkg -o matitaclean $(CCMOS) $(MAINCMOS) $(OCAML_DEBUG_FLAGS) matitaclean.ml
.PHONY: linkonly
matita: matita.ml $(LIB_DEPS) $(CMOS)
$(H)echo " OCAMLC $<"
$(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
$(H)echo " OCAMLOPT $<"
$(H)$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitac.ml
+matitaclean: matitaclean.ml $(CLIB_DEPS) $(CCMOS) $(MAINCMOS)
+ $(H)echo " OCAMLC $<"
+ $(H)$(OCAMLC) $(CPKGS) -linkpkg -o $@ $(CCMOS) $(MAINCMOS) matitaclean.ml
+matitaclean.opt: matitaclean.ml $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS)
+ $(H)echo " OCAMLOPT $<"
+ $(H)$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitaclean.ml
+
rottener: rottener.ml $(CLIB_DEPS) $(CCMOS) $(MAINCMOS)
$(H)echo " OCAMLC $<"
$(H)$(OCAMLC) $(CPKGS) -package lablgtk2 -linkpkg -o $@ $(CCMOS) $(MAINCMOS) rottener.ml
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.ui
$(H)$(LABLGLADECC) -embed $< > matitaGeneratedGui.ml
+
.PHONY: clean
clean:
$(H)rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o \
.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
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
# {{{ 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
+dist_pre:
$(MAKE) -C dist/ dist_pre
WHERE = $(DESTDIR)/$(RT_BASE_DIR)
matita.gtkrc \
matita.lang \
matita.ma.templ \
- core_notation.moo \
matita.conf.xml \
closed.xml \
- gtkmathview.matita.conf.xml \
AUTHORS \
LICENSE \
$(NULL)
$(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
$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml \
$(STATIC_EXTRA_LIBS)
strip $@
-dump_moo.opt.static: $(STATIC_LINK) buildTimeConf.cmx dump_moo.ml
+matitac.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitac.ml
$(STATIC_LINK) $(STATIC_CLIBS) -- \
- $(OCAMLOPT) $(PKGS) -linkpkg -o $@ $^ \
+ $(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitac.ml \
$(STATIC_EXTRA_CLIBS)
strip $@
-matitac.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitac.ml
+
+%.upx: %
+ cp $< $@
+ strip $@
+ upx $@
+
+matitaclean.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitaclean.ml
$(STATIC_LINK) $(STATIC_CLIBS) -- \
- $(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitac.ml \
+ $(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitaclean.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 $< $@