X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FMakefile;h=48d4e8af8c17d389aed8bbc8f32b91a85b7f765c;hb=c30b48dc423ef9c25473d7b5f211eac018f2f0fa;hp=ab03a892f002094e57d0169af7a0dfe932ef08a9;hpb=833aa28f2f3a2593ba2cdd04a25bc0bfe3182437;p=helm.git

diff --git a/matita/Makefile b/matita/Makefile
index ab03a892f..48d4e8af8 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,14 +34,15 @@ CMOS =				\
 	matitaInit.cmo		\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
+	applyTransformation.cmo	\
 	matitacLib.cmo		\
 	matitaprover.cmo        \
-	applyTransformation.cmo	\
 	matitaGtkMisc.cmo	\
 	matitaScript.cmo	\
 	matitaGeneratedGui.cmo	\
 	matitaMathView.cmo 	\
 	matitaGui.cmo		\
+	matitaAutoGui.cmo		\
 	$(NULL)
 # objects for matitac (batch compiler)
 CCMOS =				\
@@ -52,7 +53,9 @@ CCMOS =				\
 	matitaInit.cmo		\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
+	applyTransformation.cmo	\
 	matitacLib.cmo		\
+	matitaWiki.cmo		\
 	matitaprover.cmo        \
 	$(NULL)
 MAINCMOS =			\
@@ -62,7 +65,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 +160,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,6 +209,7 @@ distclean: clean
 	$(H)rm -rf .matita
 
 TEST_DIRS = 				\
+	legacy                          \
 	library 			\
 	tests 				\
 	dama				\
@@ -210,11 +219,16 @@ TEST_DIRS = 				\
 	contribs/PREDICATIVE-TOPOLOGY 	\
 	$(NULL)
 
+#	library_auto 			
+TEST_DIRS_OPT = 			\
+	$(TEST_DIRS)        \
+	$(NULL)
+
 .PHONY: tests tests.opt cleantests cleantests.opt
 tests: $(foreach d,$(TEST_DIRS),$(d)-test)
-tests.opt: $(foreach d,$(TEST_DIRS),$(d)-test-opt)
+tests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-test-opt)
 cleantests: $(foreach d,$(TEST_DIRS),$(d)-cleantests)
-cleantests.opt: $(foreach d,$(TEST_DIRS),$(d)-cleantests-opt)
+cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt)
 
 %-test: matitac matitadep matitaclean 
 	-cd $* && make -k clean all
@@ -356,6 +370,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
@@ -384,12 +400,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
+
+ifeq ($(MAKECMDGOALS), all)
+  include .depend   
+endif
 
-ifneq ($(MAKECMDGOALS), depend)
- ifneq ($(MAKECMDGOALS), depend.opt)
-   include .depend   
- endif
+ifeq ($(MAKECMDGOALS), opt)
+  include .depend.opt   
 endif
 
 %.cmi: %.mli