comments syntax changed

[helm.git] / helm / matita / Makefile.in

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 90a8a2a41559f5a9d5fd2672b25e5ab8891ebaac..bbf534b325967ccee89dc0b6ce8abd00d25d4d69 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -11,45 +11,44 @@ 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   \
-       matitaScript.cmo
+       matitaMathView.cmo
 # objects for matitac (batch compiler)
 CCMOS =                                \
        buildTimeConf.cmo       \
+       matitaLog.cmo           \
+       matitaTypes.cmo         \
        matitaMisc.cmo          \
        matitaDb.cmo            \
-       matitaTypes.cmo         \
-       matitaCicMisc.cmo       \
-       matitaProof.cmo         \
+       matitaSync.cmo          \
        matitaDisambiguator.cmo \
-       matitaInterpreter.cmo
+       matitaEngine.cmo
 
-LIB_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
 
 all: matita matitac cicbrowser
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
 CCMXS = $(patsubst %.cmo,%.cmx,$(CCMOS))
-LIBX_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(REQUIRES))
+LIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
+LIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(REQUIRES))
 opt: matita.opt matitac.opt cicbrowser.opt
 else
 opt:
@@ -72,7 +71,7 @@ cicbrowser.opt: matita.opt
        @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
@@ -81,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   \
@@ -92,10 +93,32 @@ distclean: clean
        rm -f matita.glade.bak matita.gladep.bak
        rm -rf autom4te.cache/
 
-depend: matitaGeneratedGui.ml matitaGeneratedGui.mli
+tests: matitac
+       for i in tests/*.ma; do (./matitac $$i 2> /dev/null > /dev/null && echo "\e[0;32m[OK]\e[0m $$i") || echo "\e[0;31m[KO]\e[0m $$i"; done
+.PHONY: tests
+
+tags: TAGS
+.PHONY: TAGS
+TAGS:
+       cd ..; otags -vi -r ocaml/ matita/
+
+#.depend: matitaGeneratedGui.ml matitaGeneratedGui.mli *.ml *.mli
+depend:
        $(OCAMLDEP) *.ml *.mli > .depend
 
 include .depend
 
 .PHONY: all opt clean distclean depend
 
+$(CMOS): $(LIB_DEPS)
+$(CMOS:%.cmo=%.cmx): $(LIBX_DEPS)
+
+ifeq ($(MAKECMDGOALS),all)
+   $(CMOS:%.cmo=%.cmi): $(LIB_DEPS)
+endif
+ifeq ($(MAKECMDGOALS),)
+   $(CMOS:%.cmo=%.cmi): $(LIB_DEPS)
+endif
+ifeq ($(MAKECMDGOALS),opt)
+   $(CMOS:%.cmo=%.cmi): $(LIBX_DEPS)
+endif