compilation of needed modules now outputs to the log window

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

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 4c3d9f305920bf1e76b2e2c3968b27e6d86951e9..da10c563abe1042ec09f14833b6ea941cfbd619d 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -33,6 +33,7 @@ CMOS =                                \
        matitaDisambiguator.cmo \
        matitaEngine.cmo        \
        matitacLib.cmo \
+       matitamakeLib.cmo \
        matitaScript.cmo        \
        matitaGeneratedGui.cmo  \
        matitaGtkMisc.cmo       \
@@ -52,18 +53,23 @@ CCMOS =                             \
        matitacleanLib.cmo      \
        matitacLib.cmo
 CLEANCMOS = $(CCMOS)
+MAKECMOS = $(CCMOS) matitamakeLib.cmo
 
 
-all: matita.conf.xml matita matitac matitatop cicbrowser matitadep matitaclean
+all: matita.conf.xml matita matitac matitatop cicbrowser matitadep matitaclean matitamake
 
 matita.conf.xml: matita.conf.xml.sample
-       @echo
-       @echo "matita.conf.xml.sample is newer than matita.conf.xml"
-       @echo
-       @echo "PLEASE update your configuration file!"
-       @echo "(copying matita.conf.xml.sample should work)"
-       @echo
-       @false
+       @if diff matita.conf.xml.sample matita.conf.xml 1>/dev/null 2>/dev/null; then\
+               touch matita.conf.xml;\
+       else\
+               echo;\
+               echo "matita.conf.xml.sample is newer than matita.conf.xml";\
+               echo;\
+               echo "PLEASE update your configuration file!";\
+               echo "(copying matita.conf.xml.sample should work)";\
+               echo;\
+               false;\
+       fi
 
 matita.conf.xml.sample: matita.conf.xml.sample.in
        autoconf
@@ -76,6 +82,7 @@ ifeq ($(HAVE_OCAMLOPT),yes)
 CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
 CCMXS = $(patsubst %.cmo,%.cmx,$(CCMOS))
 CLEANCMXS = $(patsubst %.cmo,%.cmx,$(CLEANCMOS))
+MAKECMXS = $(patsubst %.cmo,%.cmx,$(MAKECMOS))
 LIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
 LIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(REQUIRES))
 CLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(CREQUIRES))
@@ -84,7 +91,9 @@ DEPLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format
 DEPLIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(DEPREQUIRES))
 CLEANLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(CLEANREQUIRES))
 CLEANLIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(CLEANREQUIRES))
-opt: matita.opt matitac.opt cicbrowser.opt matitadep.opt matitaclean.opt
+MAKELIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(MAKEREQUIRES))
+MAKELIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(MAKEREQUIRES))
+opt: matita.opt matitac.opt cicbrowser.opt matitadep.opt matitaclean.opt matitamake.opt
 else
 opt:
        @echo "Native code compilation is disabled"
@@ -113,6 +122,11 @@ matitaclean: matitaclean.ml $(CLEANLIB_DEPS) $(CLEANCMOS)
 matitaclean.opt: matitaclean.ml $(CLEANLIB_DEPS) $(CLEANCMXS)
        $(OCAMLOPT) $(CLEANPKGS) -linkpkg -o $@ $(CLEANCMXS) $<
 
+matitamake: matitamake.ml $(MAKECMOS)
+       $(OCAMLC) $(PKGS) -linkpkg -o $@ $(MAKECMOS) $<
+matitamake.opt: matitamake.ml $(MAKECMXS)
+       $(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(MAKECMXS) $<
+       
 cicbrowser: matita
        @test -f $@ || ln -s $< $@
 cicbrowser.opt: matita.opt