Merge tag 'comoproj-v2.3.1' into pre-release/comoproj/coqc/v8.18.0

some fixes due to problems with coqc-8.16.1

Makefile

@@ -11,8 +11,23 @@ all: coq html
 coq: Makefile.coq
 	$(MAKE) -f Makefile.coq all
 
+define GENCoqDoc
+BEGIN { RS="[[:space:]]"; FS=":" }			\
+{							\
+    dirname = $$1;					\
+    cmd = "coqdep -f _CoqProject -sort " dirname;	\
+    while ((cmd | getline) > 0) {			\
+        if ($$0 ~ "^" dirname && !seen[$$0]) {		\
+	    print $$0;					\
+            seen[$$0] = 1;				\
+        }						\
+    }							\
+    close(cmd);						\
+}
+endef
+
 html: Makefile.coq
-	$(MAKE) -f Makefile.coq html
+	VFILES="$(shell echo $(COMPONENTS) | awk '$(GENCoqDoc)')" $(MAKE) -e -f Makefile.coq html
 
 Makefile.coq: _CoqProject
 	coq_makefile -f $< -o $@ COQDOCEXTRAFLAGS = "--lib-name $(PROJNAME)"
@@ -25,20 +40,22 @@ clean: Makefile.coq
 	rm -f _CoqProject
 
 define GENCoqPr
-BEGIN { RS="[[:space:]]"; FS=":" }\
-{					\
+BEGIN { RS="[[:space:]]"; FS=":" }			\
+{							\
     dirname = $$1;					\
     libname = $$2;					\
     print "-R " dirname " " libname;			\
-    find = "find " dirname " -name '*.v' -maxdepth 1";	\
-    while ((find | getline) > 0) {			\
-	print;						\
-    }							\
-    close(find);					\
-}
+    system("find " dirname " -name \"*.v\"");		\
+}							\
+END { print "-docroot ." }
+endef
+
+define GENDirList
+BEGIN { RS="[[:space:]]"; FS=":" }			\
+{ print $$1; }
 endef
 
-_CoqProject: Makefile
+_CoqProject: Makefile $(shell echo $(COMPONENTS) | awk '$(GENDirList)')
 	echo $(COMPONENTS) | awk '$(GENCoqPr)' > $@
 
 .PHONY: all coq html clean