X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fmatita%2FMakefile;h=307f3983a37d79c54cfe5d015ebe6fd781796a97;hb=fb8e346faf0b390cd8e81376e0dad8333547657a;hp=7c54333cd5c8f4757950914f7f31cf7c124f3fa2;hpb=aef659e5893b4bf8c8544d0c54714e10f5b5493a;p=helm.git

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index 7c54333cd..307f3983a 100644
--- a/helm/software/matita/Makefile
+++ b/helm/software/matita/Makefile
@@ -14,6 +14,9 @@ OCAMLC_FLAGS = $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS)
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS)
 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
 
 MATITA_FLAGS = -noprofile
 NODB=false
@@ -31,11 +34,12 @@ CMOS =				\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
 	matitacLib.cmo		\
+	applyTransformation.cmo	\
+	matitaGtkMisc.cmo	\
 	matitaScript.cmo	\
 	matitaGeneratedGui.cmo	\
-	matitaGtkMisc.cmo	\
-	applyTransformation.cmo	\
 	matitaMathView.cmo 	\
+	lablGraphviz.cmo	\
 	matitaGui.cmo		\
 	$(NULL)
 # objects for matitac (batch compiler)
@@ -96,11 +100,20 @@ upx: $(PROGRAMS_UPX)
 .PHONY: opt upx
 
 ifeq ($(HAVE_OCAMLOPT),yes)
-world: depend.opt opt
+world: depend.opt opt links
 else
 world: depend all
 endif
 
+#links %.opt -> %
+links:
+	$(H)for X in $(INSTALL_PROGRAMS_LINKS_MATITAC) \
+			$(INSTALL_PROGRAMS_LINKS_MATITA); do\
+		ln -sf $$X.opt $$X;\
+	done
+	$(H)ln -sf matita.opt matita
+	$(H)ln -sf matitac.opt matitac
+
 matita: matita.ml $(LIB_DEPS) $(CMOS)
 	$(H)echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(PKGS) -linkpkg -o $@ $(CMOS) matita.ml
@@ -153,6 +166,7 @@ cicbrowser.opt: matita.opt
 
 matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
 	$(H)$(LABLGLADECC) -embed $< > matitaGeneratedGui.ml
+	$(H)rm -f matitaGeneratedGui.mli
 	$(H)#$(OCAMLC) $(PKGS) -i matitaGeneratedGui.ml > matitaGeneratedGui.mli
 
 .PHONY: clean
@@ -176,7 +190,6 @@ distclean: clean
 TEST_DIRS = 				\
 	library 			\
 	tests 				\
-	tests/bad_tests 		\
 	contribs/LAMBDA-TYPES 		\
 	contribs/PREDICATIVE-TOPOLOGY 	\
 	$(NULL)
@@ -212,6 +225,9 @@ dist_library@%:
 
 endif
 
+dist_pre: matitaGeneratedGui.ml matitaGeneratedGui.mli
+	$(MAKE) -C dist/ dist_pre
+
 DESTDIR = $(RT_BASE_DIR)
 INSTALL_STUFF = 			\
 	icons/ 				\
@@ -228,9 +244,6 @@ INSTALL_STUFF = 			\
 	LICENSE 			\
 	$(NULL)
 
-INSTALL_PROGRAMS= matita matitac
-INSTALL_PROGRAMS_LINKS_MATITA= cicbrowser 
-INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitamake matitaclean
 ifeq ($(HAVE_OCAMLOPT),yes)
 INSTALL_STUFF_BIN = $(INSTALL_PROGRAMS:%=%.opt) 
 else