X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FMakefile;h=ad5a18892524466da938e2e6f8e9d0714adb3ee1;hb=8ee0e6f729105eaf1907de0baef22e170b0d17b3;hp=0562ba3bbe2eb326374569c5d2dee3bdc1cdcf9d;hpb=a55a8d25cbd7180572053be96c726f6e11c914f2;p=helm.git diff --git a/matita/Makefile b/matita/Makefile index 0562ba3bb..ad5a18892 100644 --- a/matita/Makefile +++ b/matita/Makefile @@ -5,7 +5,8 @@ include ../Makefile.defs NULL = H=@ -OCAML_FLAGS = -pp $(CAMLP4O) +OCAML_FLAGS = -pp $(CAMLP5O) -rectypes +OCAMLDEP_FLAGS = -pp $(CAMLP5O) PKGS = -package "$(MATITA_REQUIRES)" CPKGS = -package "$(MATITA_CREQUIRES)" OCAML_THREADS_FLAGS = -thread @@ -15,7 +16,7 @@ OCAML_DEBUG_FLAGS = -g OCAMLC_FLAGS = $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) OCAMLC = $(OCAMLFIND) ocamlc$(OCAML_PROF) $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS) OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS) $(OCAMLOPT_DEBUG_FLAGS) -OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS) +OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAMLDEP_FLAGS) INSTALL_PROGRAMS= matita matitac INSTALL_PROGRAMS_LINKS_MATITA= cicbrowser INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitamake matitaclean matitaprover matitawiki @@ -199,6 +200,7 @@ distclean: clean $(H)rm -rf .matita TEST_DIRS = \ + legacy \ library \ tests \ dama \ @@ -234,8 +236,6 @@ cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt) ifeq ($(DISTRIBUTED),yes) -MATITA_CFLAGS = #-nodb - dist_library: install_preliminaries dist_library@standard-library dist_library@%: $(H)echo "MATITAMAKE init $*"