X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FMakefile.in;h=a3a6fe77dc617050a913f1685587a9e5d4299c8e;hb=619a3a478a4f6b0a50782b620009f6a141c30a53;hp=d1eff032ae738fb4610321f9b355524e17ce2b33;hpb=ee3f2aa5b78aa77555e5e81d5a2d92501889649e;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index d1eff032a..a3a6fe77d 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -32,6 +32,8 @@ CMOS =				\
 	matitacleanLib.cmo \
 	matitaDisambiguator.cmo	\
 	matitaEngine.cmo	\
+	matitacLib.cmo \
+	matitamakeLib.cmo \
 	matitaScript.cmo	\
 	matitaGeneratedGui.cmo	\
 	matitaGtkMisc.cmo	\
@@ -48,19 +50,35 @@ CCMOS =				\
 	matitaSync.cmo		\
 	matitaDisambiguator.cmo	\
 	matitaEngine.cmo	\
+	matitacleanLib.cmo	\
 	matitacLib.cmo
-CLEANCMOS = $(CCMOS) matitacleanLib.cmo
+CLEANCMOS = $(CCMOS)
+MAKECMOS = $(CCMOS) matitamakeLib.cmo
 
 
-all: matita matitac matitatop cicbrowser matitadep matitaclean
+all: matita.conf.xml matita matitac matitatop cicbrowser matitadep matitaclean matitamake
 
-updater: $(LIB_DEPS)
-	$(OCAMLC) $(PKGS) -linkpkg -o $@ updater.ml
+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
+
+matita.conf.xml.sample: matita.conf.xml.sample.in
+	autoconf
+	./configure
+	@echo 
+	@echo "WARNING: The configuration sample file has changed!"
+	@echo 
 
 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))
@@ -69,7 +87,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"
@@ -98,6 +118,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
@@ -121,12 +146,14 @@ clean:
 		matita matita.opt matitac matitac.opt	\
 		cicbrowser cicbrowser.opt	\
 		matitadep matitadep.opt \
-		matitaclean matitaclean.opt
+		matitaclean matitaclean.opt \
+		matitatop matitatop.opt
 distclean: clean
 	rm -f matitaGeneratedGui.ml matitaGeneratedGui.mli
 	rm -f config.log config.status Makefile buildTimeConf.ml
 	rm -f matita.glade.bak matita.gladep.bak
 	rm -rf autom4te.cache/
+	rm -f configure matita.conf.xml.sample
 
 tests: matitac matitadep matitaclean
 	@(cd library && make clean all)