NULL =
H=@
-OCAML_FLAGS = -pp $(CAMLP4O)
+OCAML_FLAGS = -pp $(CAMLP5O) -rectypes
PKGS = -package "$(MATITA_REQUIRES)"
CPKGS = -package "$(MATITA_CREQUIRES)"
OCAML_THREADS_FLAGS = -thread
OCAML_DEBUG_FLAGS = -g
+#OCAML_PROF=p -p a
+#OCAMLOPT_DEBUG_FLAGS = -p
OCAMLC_FLAGS = $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS)
-OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS)
-OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS)
+OCAMLC = $(OCAMLFIND) ocamlc$(OCAML_PROF) $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS)
+OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS) $(OCAMLOPT_DEBUG_FLAGS)
OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
INSTALL_PROGRAMS= matita matitac
INSTALL_PROGRAMS_LINKS_MATITA= cicbrowser
matitaTypes.mli \
matitaMisc.mli \
matitamakeLib.mli \
- matitaInit.mli \
matitaExcPp.mli \
+ matitaInit.mli \
matitaEngine.mli \
applyTransformation.mli \
+ matitaAutoGui.mli \
matitacLib.mli \
matitaprover.mli \
matitaGtkMisc.mli \
matitaScript.mli \
matitaMathView.mli \
matitaGui.mli \
- matitaAutoGui.cmo \
$(NULL)
CMLI = \
matitaTypes.mli \
matitaMisc.mli \
matitamakeLib.mli \
- matitaInit.mli \
matitaExcPp.mli \
+ matitaInit.mli \
matitaEngine.mli \
applyTransformation.mli \
matitacLib.mli \
CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
CCMXS = $(patsubst %.cmo,%.cmx,$(CCMOS))
MAINCMXS = $(patsubst %.cmo,%.cmx,$(MAINCMOS))
-$(CMOS): $(LIB_DEPS)
+$(CMOS) : $(LIB_DEPS)
$(CMXOS): $(LIBX_DEPS)
LIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(MATITA_REQUIRES))
dama \
contribs/CoRN \
contribs/RELATIONAL \
+ contribs/LOGIC \
contribs/LAMBDA-TYPES \
contribs/PREDICATIVE-TOPOLOGY \
$(NULL)
ln -fs matita $(WHERE)/$$p;\
done
$(H)cp -a library/ $(WHERE)/ma/standard-library
- $(H)cp -a contribs/ $(WHERE)/ma/
+ #$(H)cp -a contribs/ $(WHERE)/ma/
$(H)touch install_preliminaries.stamp
uninstall:
$(H)echo " OCAMLDEP -native"
$(H)$(OCAMLDEP) -native *.ml *.mli > .depend.opt
-ifeq ($(MAKECMDGOALS),)
- include .depend
-endif
-
-ifeq ($(MAKECMDGOALS), all)
- include .depend
+# this should be sligtly better, since should work with 'make all opt'
+MAKECMDGOALS_DELIM=$(addprefix _x_,$(addsuffix _x_,$(MAKECMDGOALS)))
+ifneq (,$(findstring _x_all_x_,$(MAKECMDGOALS_DELIM)))
+ # if we 'make all opt' the deps for 'all' should be fine also for opt
+ # if we 'make opt all' it should not work...
+ INCLUDE_MANDATORY=yes
+ TO_INCLUDE+=.depend
+ TO_DEPEND_ON=$(LIB_DEPS)
+else ifneq (,$(findstring _x_opt_x_,$(MAKECMDGOALS_DELIM)))
+ INCLUDE_MANDATORY=yes
+ TO_INCLUDE+=.depend.opt
+ TO_DEPEND_ON=$(LIBX_DEPS)
+else ifneq (,$(findstring _x_world_x_,$(MAKECMDGOALS_DELIM)))
+ ifeq ($(HAVE_OCAMLOPT),yes)
+ INCLUDE_MANDATORY=yes
+ TO_INCLUDE+=.depend.opt
+ TO_DEPEND_ON=$(LIBX_DEPS)
+ else
+ INCLUDE_MANDATORY=yes
+ TO_INCLUDE+=.depend
+ TO_DEPEND_ON=$(LIB_DEPS)
+ endif
+else
+ TO_INCLUDE+=.depend
+ INCLUDE_MANDATORY=no
+ TO_DEPEND_ON=$(LIB_DEPS)
endif
-ifeq ($(MAKECMDGOALS), opt)
- include .depend.opt
-endif
+$(MLI:%.mli=%.cmi) $(ML:%.ml=%.cmo) $(ML:%.ml=%.cmx): $(TO_DEPEND_ON)
-ifeq ($(MAKECMDGOALS), world)
- include .depend.opt
+ifeq (no,$(INCLUDE_MANDATORY))
+ -include $(TO_INCLUDE)
+else
+ include $(TO_INCLUDE)
endif
%.cmi: %.mli