Merge tag 'comoproj-v2.7.0' into pre-release/comoproj/coqc-8.16.1-ocaml-4.13.1

Included coqdocjs

.gitlab-ci.yml

@@ -14,6 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+  GIT_SUBMODULE_FORCE_HTTPS: "true"
+
 stages:
   - build
 

.gitmodules

+[submodule "coqdocjs"]
+	path = coqdocjs
+	url = https://github.com/coq-community/coqdocjs.git

Makefile

@@ -17,15 +17,11 @@
 # Configuration
 
 #TODO Change the following lines for configuration.
-PROJNAME = CoMoProj
 COMPONENTS := src:SRC
 
 COQDOC_FLAGS = --utf8
 
-all: coq html
-
-coq: Makefile.coq
-	$(MAKE) -f Makefile.coq all
+all: coqdoc
 
 define GENCoqDoc
 BEGIN { RS="[[:space:]]"; FS=":" }			\
@@ -46,7 +42,7 @@ html: Makefile.coq
 	VFILES="$(shell echo $(COMPONENTS) | awk '$(GENCoqDoc)')" $(MAKE) -e -f Makefile.coq html
 
 Makefile.coq: _CoqProject
-	coq_makefile -f $< -o $@ COQDOCEXTRAFLAGS = "--lib-name $(PROJNAME)"
+	coq_makefile -f $< -o $@
 
 clean: Makefile.coq
 	$(MAKE) -f $< cleanall
@@ -74,4 +70,7 @@ endef
 _CoqProject: Makefile $(shell echo $(COMPONENTS) | awk '$(GENDirList)')
 	echo $(COMPONENTS) | awk '$(GENCoqPr)' > $@
 
-.PHONY: all coq html clean
+.PHONY: all html clean
+
+COQMAKEFILE := Makefile # Do not change!
+include coqdocjs/Makefile.doc

coqdocjs @ 57401849

+Subproject commit 57401849fffb24500c078973a8382dd3086fd2bf