Unify with Lebesgue folder: CoqMakefile -> Makefile.

LM/Makefile

@@ -17,7 +17,7 @@ PARENT := $(firstword $(MAKEFILE_LIST))
 
 # This file is generated by coq_makefile and contains many variable
 # definitions, like the list of .v files or the path to Coq
-include CoqMakefile.conf
+include Makefile.conf
 
 # Put in place old names
 VFILES            := $(COQMF_VFILES)
@@ -43,18 +43,18 @@ CAMLFLAGS         := $(COQMF_CAMLFLAGS)
 HASNATDYNLINK     := $(COQMF_HASNATDYNLINK)
 OCAMLWARN         := $(COQMF_WARN)
 
-CoqMakefile.conf: _CoqProject
-	coq_makefile -f _CoqProject
+Makefile.conf: _CoqProject
+	coq_makefile -f _CoqProject -o Makefile
 
 # This file can be created by the user to hook into double colon rules or
 # add any other Makefile code he may need
--include CoqMakefile.local
+-include Makefile.local
 
 # Parameters ##################################################################
 #
 # Parameters are make variable assignments.
 # They can be passed to (each call to) make on the command line.
-# They can also be put in CoqMakefile.local once and for all.
+# They can also be put in Makefile.local once and for all.
 # For retro-compatibility reasons they can be put in the _CoqProject, but this
 # practice is discouraged since _CoqProject better not contain make specific
 # code (be nice to user interfaces).
@@ -175,13 +175,13 @@ COQTOPINSTALL ?= $(call destination_path,$(COQLIB)/toploop) # FIXME: Unused vari
 ########## End of parameters ##################################################
 # What follows may be relevant to you only if you need to
 # extend this Makefile.  If so, look for 'Extension point' here and
-# put in CoqMakefile.local double colon rules accordingly.
+# put in Makefile.local double colon rules accordingly.
 # E.g. to perform some work after the all target completes you can write
 #
 # post-all::
 # 	echo "All done!"
 #
-# in CoqMakefile.local
+# in Makefile.local
 #
 ###############################################################################
 
@@ -291,7 +291,7 @@ endif
 # We here define a bunch of variables about the files being part of the
 # Coq project in order to ease the writing of build target and build rules
 
-VDFILE := .CoqMakefile.d
+VDFILE := .Makefile.d
 
 ALLSRCFILES := \
 	$(MLGFILES) \
@@ -567,7 +567,7 @@ beautify: $(BEAUTYFILES)
 
 # Installation targets ########################################################
 #
-# There rules can be extended in CoqMakefile.local
+# There rules can be extended in Makefile.local
 # Extensions can't assume when they run.
 
 install:
@@ -640,7 +640,7 @@ uninstall-doc::
 
 # Cleaning ####################################################################
 #
-# There rules can be extended in CoqMakefile.local
+# There rules can be extended in Makefile.local
 # Extensions can't assume when they run.
 
 clean::
@@ -864,10 +864,10 @@ opt:
 .PHONY:	opt
 
 # This is deprecated.  To extend this makefile use
-# extension points and CoqMakefile.local
+# extension points and Makefile.local
 printenv::
 	$(warning printenv is deprecated)
-	$(warning write extensions in CoqMakefile.local or include CoqMakefile.conf)
+	$(warning write extensions in Makefile.local or include Makefile.conf)
 	@echo 'COQLIB = $(COQLIB)'
 	@echo 'COQCORELIB = $(COQCORELIB)'
 	@echo 'DOCDIR = $(DOCDIR)'
@@ -885,7 +885,7 @@ printenv::
 .PHONY:	printenv
 
 # Generate a .merlin file.  If you need to append directives to this
-# file you can extend the merlin-hook target in CoqMakefile.local
+# file you can extend the merlin-hook target in Makefile.local
 .merlin:
 	$(SHOW)'FILL .merlin'
 	$(HIDE)echo 'FLG $(COQMF_CAMLFLAGS)' > .merlin
@@ -914,10 +914,10 @@ debug:
 
 .DEFAULT_GOAL := all
 
-# Users can create CoqMakefile.local-late to hook into double-colon rules
+# Users can create Makefile.local-late to hook into double-colon rules
 # or add other needed Makefile code, using defined
 # variables if necessary.
--include CoqMakefile.local-late
+-include Makefile.local-late
 
 # Local Variables:
 # mode: makefile-gmake