X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FMakefile;h=1b73fe2da0da33ac1b83959be43d1bc5af2c0924;hb=cf664aff0bf81f98d07e217a93544d906d5bd480;hp=9043c9ff83cd00e5e33765cbbf26beb4a5fc8de3;hpb=a2ce5cbdb11041cfd9c09c8136880c5647605dd6;p=helm.git

diff --git a/matita/Makefile b/matita/Makefile
index 9043c9ff8..1b73fe2da 100644
--- a/matita/Makefile
+++ b/matita/Makefile
@@ -16,7 +16,7 @@ OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
 INSTALL_PROGRAMS= matita matitac
 INSTALL_PROGRAMS_LINKS_MATITA= cicbrowser 
-INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitamake matitaclean matitaprover
+INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitamake matitaclean matitaprover matitawiki
 
 MATITA_FLAGS = -noprofile
 NODB=false
@@ -34,8 +34,9 @@ CMOS =				\
 	matitaInit.cmo		\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
-	matitacLib.cmo		\
 	applyTransformation.cmo	\
+	matitacLib.cmo		\
+	matitaprover.cmo        \
 	matitaGtkMisc.cmo	\
 	matitaScript.cmo	\
 	matitaGeneratedGui.cmo	\
@@ -51,7 +52,9 @@ CCMOS =				\
 	matitaInit.cmo		\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
+	applyTransformation.cmo	\
 	matitacLib.cmo		\
+	matitaWiki.cmo		\
 	matitaprover.cmo        \
 	$(NULL)
 MAINCMOS =			\
@@ -61,7 +64,7 @@ MAINCMOS =			\
 	gragrep.cmo 		\
 	$(NULL)
 PROGRAMS_BYTE = \
-	matita matitac cicbrowser matitadep matitaclean matitamake matitaprover
+	matita matitac cicbrowser matitadep matitaclean matitamake matitaprover matitawiki
 PROGRAMS = $(PROGRAMS_BYTE) matitatop
 PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS_BYTE))
 NOINST_PROGRAMS = dump_moo gragrep
@@ -115,6 +118,12 @@ links:
 	$(H)ln -sf matita.opt matita
 	$(H)ln -sf matitac.opt matitac
 
+linkonly:
+	$(H)echo "  OCAMLC matita.ml"
+	$(H)$(OCAMLC) $(PKGS) -linkpkg -o matita $(CMOS) matita.ml
+	$(H)echo "  OCAMLC matitac.ml"
+	$(H)$(OCAMLC) $(CPKGS) -linkpkg -o matitac $(CCMOS) $(MAINCMOS) matitac.ml
+.PHONY: linkonly
 matita: matita.ml $(LIB_DEPS) $(CMOS)
 	$(H)echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(PKGS) -linkpkg -o $@ $(CMOS) matita.ml
@@ -150,6 +159,11 @@ matitadep: matitac
 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
@@ -194,8 +208,12 @@ distclean: clean
 	$(H)rm -rf .matita
 
 TEST_DIRS = 				\
+	legacy                          \
 	library 			\
 	tests 				\
+	dama				\
+	contribs/CoRN	 	        \
+	contribs/RELATIONAL	 	\
 	contribs/LAMBDA-TYPES 		\
 	contribs/PREDICATIVE-TOPOLOGY 	\
 	$(NULL)
@@ -346,6 +364,8 @@ 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
@@ -374,12 +394,18 @@ depend:
 	$(H)$(OCAMLDEP) *.ml *.mli > .depend
 depend.opt:
 	$(H)echo "  OCAMLDEP -native"
-	$(H)$(OCAMLDEP) -native *.ml *.mli > .depend
+	$(H)$(OCAMLDEP) -native *.ml *.mli > .depend.opt
+
+ifeq ($(MAKECMDGOALS),)
+  include .depend   
+endif
 
-ifneq ($(MAKECMDGOALS), depend)
- ifneq ($(MAKECMDGOALS), depend.opt)
-   include .depend   
- endif
+ifeq ($(MAKECMDGOALS), all)
+  include .depend   
+endif
+
+ifeq ($(MAKECMDGOALS), opt)
+  include .depend.opt   
 endif
 
 %.cmi: %.mli
@@ -398,6 +424,11 @@ endif
 $(CMOS): $(LIB_DEPS)
 $(CMOS:%.cmo=%.cmx): $(LIBX_DEPS)
 
+deps.ps: deps.dot
+	dot -Tps -o $@ $<
+deps.dot: .depend
+	./dep2dot.rb < $< | tred > $@
+
 ifeq ($(MAKECMDGOALS),all)
    $(CMOS:%.cmo=%.cmi): $(LIB_DEPS)
 endif