Merge branch 'topic/bump_master' into 'master'

Bump edge to master

See merge request eng/ide/gnatdoc!175

Author: AnthonyLeonardoGracio

Makefile

@@ -8,7 +8,8 @@ SCENARIO_VARIABLES=\
 	-XMARKDOWN_LIBRARY_TYPE=static \
 	-XLIBADALANG_LIBRARY_TYPE=static \
 	-XLANGKIT_SUPPORT_LIBRARY_TYPE=static \
-	-XPRETTIER_ADA_LIBRARY_TYPE=static
+	-XPRETTIER_ADA_LIBRARY_TYPE=static \
+	-XGPR2_LIBRARY_TYPE=static
 
 all: build-gnatdoc
 

gnat/gnatdoc.gpr

@@ -27,7 +27,9 @@ project GNATdoc is
    for Source_Dirs use
      ("../config",
       "../source/backend",
+      "../source/backend/odf",
       "../source/backend/rst",
+      "../source/backend/xml_templates",
       "../source/frontend",
       "../source/gnatdoc");
    for Exec_Dir use "../bin";