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

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 02686b0fb..e7f4f677b 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -2,31 +2,50 @@
 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 =
-OCAMLC = $(OCAMLFIND) ocamlc $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS)
-OCAMLOPT = $(OCAMLFIND) opt $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS)
+OCAMLC_FLAGS = $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS)
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLC_FLAGS)
+OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
 CMOS =				\
 	buildTimeConf.cmo	\
+	matitaMisc.cmo		\
 	matitaGeneratedGui.cmo	\
+	matitaTypes.cmo		\
+	matitaCicMisc.cmo	\
 	matitaGtkMisc.cmo	\
-	matitaGui.cmo
-CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
+	matitaConsole.cmo	\
+	matitaGui.cmo		\
+	matitaProof.cmo		\
+	matitaDisambiguator.cmo	\
+	matitaMathView.cmo	\
+	matitaInterpreter.cmo
+
+LIB_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
 
 all: matita
+
+ifeq ($(HAVE_OCAMLOPT),yes)
+CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
+LIBX_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(REQUIRES))
 opt: matita.opt
+else
+opt:
+	@echo "Native code compilation is disabled"
+endif
 
-matita: $(CMOS) matita.ml
-	$(OCAMLC) -linkpkg -o $@ $^
-matita.opt: $(CMXS) matita.ml
-	$(OCAMLOPT) -linkpkg -o $@ $^
+matita: $(LIB_DEPS) $(CMOS) matita.ml
+	$(OCAMLC) -linkpkg -o $@ $(CMOS) matita.ml
+matita.opt: $(LIBX_DEPS) $(CMXS) matita.ml
+	$(OCAMLOPT) -linkpkg -o $@ $(CMXS) matita.ml
 
 matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
-	$(LABLGLADECC) $< > $@
+	$(LABLGLADECC) $< > matitaGeneratedGui.ml
 	$(OCAMLC) -i matitaGeneratedGui.ml > matitaGeneratedGui.mli
 
 %.cmi: %.mli
@@ -40,7 +59,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/