X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=9b28fd8c9e8e2a6f296fadfcddde9b60712ed54f;hb=481992ea591bf53cba758a96e7d42e9cdce7e129;hp=c784b0be698f86fb9a5472ec2f8a64d3824e2ab2;hpb=d651bf2e3d560e194fbe948dd950dd600a40eab6;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index c784b0be6..9b28fd8c9 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -3,6 +3,7 @@ OCAMLFIND = @OCAMLFIND@
 CAMLP4O = @CAMLP4O@
 LABLGLADECC = @LABLGLADECC@
 REQUIRES = @FINDLIB_REQUIRES@
+HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
 
 OCAML_FLAGS = -package "$(REQUIRES)" -pp $(CAMLP4O)
 OCAML_THREADS_FLAGS = -thread
@@ -13,12 +14,22 @@ OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
 CMOS =				\
 	buildTimeConf.cmo	\
 	matitaGeneratedGui.cmo	\
+	matitaTypes.cmo		\
 	matitaGtkMisc.cmo	\
-	matitaGui.cmo
+	matitaConsole.cmo	\
+	matitaGui.cmo		\
+	matitaProof.cmo		\
+	matitaDisambiguator.cmo
 CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
 
 all: matita
+
+ifeq ($(HAVE_OCAMLOPT),yes)
 opt: matita.opt
+else
+opt:
+	@echo "Native code compilation is disabled"
+endif
 
 matita: $(CMOS) matita.ml
 	$(OCAMLC) -linkpkg -o $@ $^
@@ -26,7 +37,7 @@ matita.opt: $(CMXS) matita.ml
 	$(OCAMLOPT) -linkpkg -o $@ $^
 
 matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
-	$(LABLGLADECC) $< > $@
+	$(LABLGLADECC) $< > matitaGeneratedGui.ml
 	$(OCAMLC) -i matitaGeneratedGui.ml > matitaGeneratedGui.mli
 
 %.cmi: %.mli
@@ -40,7 +51,7 @@ clean:
 	rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o matita matita.opt
 distclean: clean
 	rm -f matitaGeneratedGui.ml matitaGeneratedGui.mli
-	rm -f config.log config.status configure Makefile buildTimeConf.ml
+	rm -f config.log config.status Makefile buildTimeConf.ml
 	rm -f matita.glade.bak matita.gladep.bak
 	rm -rf autom4te.cache/