X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FMakefile;h=6f62f254652c8ed9a7b1515d920e1deb896af131;hb=797f9ece92237a8d583a0c32ef4fa755299f9949;hp=c51e7b7b653e6f6e2e936c77077d57641a156c65;hpb=b5fdd3c31b9595c0c1c1b9954bcf5a914b2a1fbb;p=helm.git

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index c51e7b7b6..6f62f2546 100644
--- a/helm/software/matita/Makefile
+++ b/helm/software/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,9 +34,9 @@ CMOS =				\
 	matitaInit.cmo		\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
+	applyTransformation.cmo	\
 	matitacLib.cmo		\
 	matitaprover.cmo        \
-	applyTransformation.cmo	\
 	matitaGtkMisc.cmo	\
 	matitaScript.cmo	\
 	matitaGeneratedGui.cmo	\
@@ -52,7 +52,9 @@ CCMOS =				\
 	matitaInit.cmo		\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
+	applyTransformation.cmo	\
 	matitacLib.cmo		\
+	matitaWiki.cmo		\
 	matitaprover.cmo        \
 	$(NULL)
 MAINCMOS =			\
@@ -62,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
@@ -157,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
@@ -201,11 +208,16 @@ distclean: clean
 	$(H)rm -rf .matita
 
 TEST_DIRS = 				\
+	legacy                          \
 	library 			\
+	library_auto 			\
 	tests 				\
+	dama				\
+	contribs/CoRN	 	        \
+	contribs/RELATIONAL	 	\
+	contribs/LAMBDA-TYPES 		\
+	contribs/PREDICATIVE-TOPOLOGY 	\
 	$(NULL)
-#	contribs/LAMBDA-TYPES 		\
-#	contribs/PREDICATIVE-TOPOLOGY 	\
 
 .PHONY: tests tests.opt cleantests cleantests.opt
 tests: $(foreach d,$(TEST_DIRS),$(d)-test)
@@ -353,6 +365,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
@@ -381,12 +395,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
 
-ifneq ($(MAKECMDGOALS), depend)
- ifneq ($(MAKECMDGOALS), depend.opt)
-   include .depend   
- endif
+ifeq ($(MAKECMDGOALS),)
+  include .depend   
+endif
+
+ifeq ($(MAKECMDGOALS), all)
+  include .depend   
+endif
+
+ifeq ($(MAKECMDGOALS), opt)
+  include .depend.opt   
 endif
 
 %.cmi: %.mli
@@ -405,6 +425,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