From: Enrico Tassi Date: Mon, 23 Jul 2007 09:14:53 +0000 (+0000) Subject: fixed makefiles to make it compile cleanly again X-Git-Tag: make_still_working~6140 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=a861d697fb8c13f8b12507a576aba03d0b33024c;p=helm.git fixed makefiles to make it compile cleanly again --- diff --git a/helm/software/matita/.depend b/helm/software/matita/.depend index 9c5ccf8af..b0d8efc5b 100644 --- a/helm/software/matita/.depend +++ b/helm/software/matita/.depend @@ -6,8 +6,10 @@ gragrep.cmo: matitaInit.cmi buildTimeConf.cmo gragrep.cmi gragrep.cmx: matitaInit.cmx buildTimeConf.cmx gragrep.cmi lablGraphviz.cmo: lablGraphviz.cmi lablGraphviz.cmx: lablGraphviz.cmi -matitaAutoGui.cmo: matitaGeneratedGui.cmo -matitaAutoGui.cmx: matitaGeneratedGui.cmx +matitaAutoGui.cmo: matitaGeneratedGui.cmo applyTransformation.cmi \ + matitaAutoGui.cmi +matitaAutoGui.cmx: matitaGeneratedGui.cmx applyTransformation.cmx \ + matitaAutoGui.cmi matitaclean.cmo: matitaMisc.cmi matitaInit.cmi matitaclean.cmi matitaclean.cmx: matitaMisc.cmx matitaInit.cmx matitaclean.cmi matitacLib.cmo: matitamakeLib.cmi matitaMisc.cmi matitaInit.cmi \ @@ -32,10 +34,12 @@ matitaGtkMisc.cmx: matitaTypes.cmx matitaGeneratedGui.cmx buildTimeConf.cmx \ matitaGtkMisc.cmi matitaGui.cmo: matitaprover.cmi matitamakeLib.cmi matitaTypes.cmi \ matitaScript.cmi matitaMisc.cmi matitaMathView.cmi matitaGtkMisc.cmi \ - matitaGeneratedGui.cmo matitaExcPp.cmi buildTimeConf.cmo matitaGui.cmi + matitaGeneratedGui.cmo matitaExcPp.cmi matitaAutoGui.cmi \ + buildTimeConf.cmo matitaGui.cmi matitaGui.cmx: matitaprover.cmx matitamakeLib.cmx matitaTypes.cmx \ matitaScript.cmx matitaMisc.cmx matitaMathView.cmx matitaGtkMisc.cmx \ - matitaGeneratedGui.cmx matitaExcPp.cmx buildTimeConf.cmx matitaGui.cmi + matitaGeneratedGui.cmx matitaExcPp.cmx matitaAutoGui.cmx \ + buildTimeConf.cmx matitaGui.cmi matitaInit.cmo: matitamakeLib.cmi matitaExcPp.cmi buildTimeConf.cmo \ matitaInit.cmi matitaInit.cmx: matitamakeLib.cmx matitaExcPp.cmx buildTimeConf.cmx \ @@ -55,7 +59,7 @@ matitaMathView.cmx: matitamakeLib.cmx matitaTypes.cmx matitaScript.cmx \ matitaMisc.cmo: buildTimeConf.cmo matitaMisc.cmi matitaMisc.cmx: buildTimeConf.cmx matitaMisc.cmi matita.cmo: matitaTypes.cmi matitaScript.cmi matitaMathView.cmi \ - matitaInit.cmi matitaGui.cmi matitaGtkMisc.cmi matitaAutoGui.cmo \ + matitaInit.cmi matitaGui.cmi matitaGtkMisc.cmi matitaAutoGui.cmi \ buildTimeConf.cmo applyTransformation.cmi matita.cmx: matitaTypes.cmx matitaScript.cmx matitaMathView.cmx \ matitaInit.cmx matitaGui.cmx matitaGtkMisc.cmx matitaAutoGui.cmx \ diff --git a/helm/software/matita/.depend.opt b/helm/software/matita/.depend.opt index d4b23c34c..c450f01c8 100644 --- a/helm/software/matita/.depend.opt +++ b/helm/software/matita/.depend.opt @@ -6,8 +6,10 @@ gragrep.cmo: matitaInit.cmi buildTimeConf.cmx gragrep.cmi gragrep.cmx: matitaInit.cmx buildTimeConf.cmx gragrep.cmi lablGraphviz.cmo: lablGraphviz.cmi lablGraphviz.cmx: lablGraphviz.cmi -matitaAutoGui.cmo: matitaGeneratedGui.cmx -matitaAutoGui.cmx: matitaGeneratedGui.cmx +matitaAutoGui.cmo: matitaGeneratedGui.cmx applyTransformation.cmi \ + matitaAutoGui.cmi +matitaAutoGui.cmx: matitaGeneratedGui.cmx applyTransformation.cmx \ + matitaAutoGui.cmi matitaclean.cmo: matitaMisc.cmi matitaInit.cmi matitaclean.cmi matitaclean.cmx: matitaMisc.cmx matitaInit.cmx matitaclean.cmi matitacLib.cmo: matitamakeLib.cmi matitaMisc.cmi matitaInit.cmi \ @@ -32,10 +34,12 @@ matitaGtkMisc.cmx: matitaTypes.cmx matitaGeneratedGui.cmx buildTimeConf.cmx \ matitaGtkMisc.cmi matitaGui.cmo: matitaprover.cmi matitamakeLib.cmi matitaTypes.cmi \ matitaScript.cmi matitaMisc.cmi matitaMathView.cmi matitaGtkMisc.cmi \ - matitaGeneratedGui.cmx matitaExcPp.cmi buildTimeConf.cmx matitaGui.cmi + matitaGeneratedGui.cmx matitaExcPp.cmi matitaAutoGui.cmi \ + buildTimeConf.cmx matitaGui.cmi matitaGui.cmx: matitaprover.cmx matitamakeLib.cmx matitaTypes.cmx \ matitaScript.cmx matitaMisc.cmx matitaMathView.cmx matitaGtkMisc.cmx \ - matitaGeneratedGui.cmx matitaExcPp.cmx buildTimeConf.cmx matitaGui.cmi + matitaGeneratedGui.cmx matitaExcPp.cmx matitaAutoGui.cmx \ + buildTimeConf.cmx matitaGui.cmi matitaInit.cmo: matitamakeLib.cmi matitaExcPp.cmi buildTimeConf.cmx \ matitaInit.cmi matitaInit.cmx: matitamakeLib.cmx matitaExcPp.cmx buildTimeConf.cmx \ @@ -55,7 +59,7 @@ matitaMathView.cmx: matitamakeLib.cmx matitaTypes.cmx matitaScript.cmx \ matitaMisc.cmo: buildTimeConf.cmx matitaMisc.cmi matitaMisc.cmx: buildTimeConf.cmx matitaMisc.cmi matita.cmo: matitaTypes.cmi matitaScript.cmi matitaMathView.cmi \ - matitaInit.cmi matitaGui.cmi matitaGtkMisc.cmi matitaAutoGui.cmx \ + matitaInit.cmi matitaGui.cmi matitaGtkMisc.cmi matitaAutoGui.cmi \ buildTimeConf.cmx applyTransformation.cmi matita.cmx: matitaTypes.cmx matitaScript.cmx matitaMathView.cmx \ matitaInit.cmx matitaGui.cmx matitaGtkMisc.cmx matitaAutoGui.cmx \ diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile index 1c11060d4..93b26cac9 100644 --- a/helm/software/matita/Makefile +++ b/helm/software/matita/Makefile @@ -35,6 +35,7 @@ MLI = \ matitaInit.mli \ matitaEngine.mli \ applyTransformation.mli \ + matitaAutoGui.mli \ matitacLib.mli \ matitaprover.mli \ matitaGtkMisc.mli \ @@ -61,7 +62,7 @@ MAINCMLI = \ gragrep.mli \ $(NULL) # objects for matita (GTK GUI) -ML = buildTimeConf.ml matitaGeneratedGui.ml matitaAutoGui.ml $(MLI:%.mli=%.ml) +ML = buildTimeConf.ml matitaGeneratedGui.ml $(MLI:%.mli=%.ml) # objects for matitac (batch compiler) CML = buildTimeConf.ml $(CMLI:%.mli=%.ml) MAINCML = $(MAINCMLI:%.mli=%.ml) diff --git a/helm/software/matita/dist/Makefile b/helm/software/matita/dist/Makefile index dccc22f15..33aeac735 100644 --- a/helm/software/matita/dist/Makefile +++ b/helm/software/matita/dist/Makefile @@ -1,6 +1,6 @@ MYSQL_FLAGS = --extended_insert --lock-tables=off --no-create-info DB = -u helm -h mowgli.cs.unibo.it matita -TABLE_CREATOR = ../../ocaml/metadata/table_creator/table_creator +TABLE_CREATOR = ../../components/binaries/table_creator/table_creator TABLES := $(shell $(TABLE_CREATOR) list all) MANUAL_DIR = ../help/C WEB_DIR = ../../../www/matita diff --git a/helm/software/matita/matitaAutoGui.mli b/helm/software/matita/matitaAutoGui.mli new file mode 100644 index 000000000..6715298e2 --- /dev/null +++ b/helm/software/matita/matitaAutoGui.mli @@ -0,0 +1,32 @@ +(* Copyright (C) 2004-2005, HELM Team. + * + * This file is part of HELM, an Hypertextual, Electronic + * Library of Mathematics, developed at the Computer Science + * Department, University of Bologna, Italy. + * + * HELM is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * HELM is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with HELM; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, + * MA 02111-1307, USA. + * + * For details, see the HELM World-Wide-Web page, + * http://helm.cs.unibo.it/ + *) + +(* $Id$ *) + +type status = + Cic.context * + (int * Cic.term * bool * int * (int * Cic.term) list) list * + (int * Cic.term * int) list * Cic.term list +val auto_dialog : (unit -> status) -> unit