X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=c95a2b10747885da6a73b15330e15e563fde074c;hb=aca103d3c3d740efcc0bcc2932922cff77facb49;hp=aadfd26ad1e7b8d532a90ff0f7503a9347f511f0;hpb=541a200b13431987114dd3fd88ec9764cee1e772;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index aadfd26ad..c95a2b107 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -11,33 +11,35 @@ PKGS = -package "$(REQUIRES)"
 CPKGS = -package "$(CREQUIRES)"
 OCAML_THREADS_FLAGS = -thread
 OCAML_DEBUG_FLAGS = -g
-OCAMLC_FLAGS = $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS)
-OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLC_FLAGS)
+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)
 # objects for matita (GTK GUI)
 CMOS =				\
 	buildTimeConf.cmo	\
+	matitaLog.cmo		\
+	matitaTypes.cmo		\
 	matitaMisc.cmo		\
+	matitaDb.cmo		\
+	matitaSync.cmo		\
+	matitaDisambiguator.cmo	\
+	matitaEngine.cmo	\
+	matitaScript.cmo	\
 	matitaGeneratedGui.cmo	\
-	matitaTypes.cmo		\
-	matitaCicMisc.cmo	\
 	matitaGtkMisc.cmo	\
-	matitaConsole.cmo	\
 	matitaGui.cmo		\
-	matitaProof.cmo		\
-	matitaDisambiguator.cmo	\
-	matitaMathView.cmo	\
-	matitaInterpreter.cmo
+	matitaMathView.cmo
 # objects for matitac (batch compiler)
 CCMOS =				\
 	buildTimeConf.cmo	\
-	matitaMisc.cmo		\
+	matitaLog.cmo		\
 	matitaTypes.cmo		\
-	matitaCicMisc.cmo	\
-	matitaProof.cmo		\
+	matitaMisc.cmo		\
+	matitaDb.cmo		\
+	matitaSync.cmo		\
 	matitaDisambiguator.cmo	\
-	matitaInterpreter.cmo
+	matitaEngine.cmo
 
 LIB_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
 
@@ -54,10 +56,8 @@ opt:
 endif
 
 matita: $(LIB_DEPS) $(CMOS) matita.ml
-	rm -f cicbrowser
 	$(OCAMLC) $(PKGS) -linkpkg -o $@ $(CMOS) matita.ml
 matita.opt: $(LIBX_DEPS) $(CMXS) matita.ml
-	rm -f cicbrowser.opt
 	$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml
 
 matitac: $(LIB_DEPS) $(CCMOS) matitac.ml
@@ -66,12 +66,12 @@ matitac.opt: $(LIBX_DEPS) $(CMXS) matitac.ml
 	$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) matitac.ml
 
 cicbrowser: matita
-	test -f $@ || ln -s $< $@
+	@test -f $@ || ln -s $< $@
 cicbrowser.opt: matita.opt
-	test -f $@ || ln -s $< $@
+	@test -f $@ || ln -s $< $@
 
 matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
-	$(LABLGLADECC) $< > matitaGeneratedGui.ml
+	$(LABLGLADECC) -embed $< > matitaGeneratedGui.ml
 	$(OCAMLC) $(PKGS) -i matitaGeneratedGui.ml > matitaGeneratedGui.mli
 
 %.cmi: %.mli
@@ -80,6 +80,8 @@ matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
 	$(OCAMLC) $(PKGS) -c $<
 %.cmx: %.ml
 	$(OCAMLOPT) $(PKGS) -c $<
+%.annot: %.ml
+	$(OCAMLC) -dtypes $(PKGS) -c $<
 
 clean:
 	rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o	\
@@ -91,7 +93,13 @@ distclean: clean
 	rm -f matita.glade.bak matita.gladep.bak
 	rm -rf autom4te.cache/
 
-depend: matitaGeneratedGui.ml matitaGeneratedGui.mli
+tags: TAGS
+.PHONY: TAGS
+TAGS:
+	otags -vi -r ../ocaml/ .
+
+#.depend: matitaGeneratedGui.ml matitaGeneratedGui.mli *.ml *.mli
+.depend:
 	$(OCAMLDEP) *.ml *.mli > .depend
 
 include .depend