X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=79b3b0f75393a15a4512f7db5ee5950b61dac0d3;hb=cc465115cdeea9819f43a5ad219b07c4f928c43a;hp=02686b0fb1d0ff97879a106261539b9a4d9ce834;hpb=c5d4ad1c98c1434b95a8a9b1c8697dd36cf39623;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 02686b0fb..79b3b0f75 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -2,8 +2,9 @@
 OCAMLFIND = @OCAMLFIND@
 CAMLP4O = @CAMLP4O@
 LABLGLADECC = @LABLGLADECC@
+REQUIRES = @FINDLIB_REQUIRES@
+HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
 
-REQUIRES = lablgtk2.glade helm-registry
 OCAML_FLAGS = -package "$(REQUIRES)" -pp $(CAMLP4O)
 OCAML_THREADS_FLAGS = -thread
 OCAML_DEBUG_FLAGS =
@@ -13,12 +14,21 @@ OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
 CMOS =				\
 	buildTimeConf.cmo	\
 	matitaGeneratedGui.cmo	\
+	matitaTypes.cmo		\
 	matitaGtkMisc.cmo	\
-	matitaGui.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 +36,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 +50,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/