Hi Hans, On 8/20/20 9:42 AM, Hans Verkuil wrote: > On 06/08/2020 17:55, Ariel D'Alessandro wrote: >> Supports building libraries and tools found in contrib/, lib/ and >> utils/ directories, along with the implemented gettext translations. >> >> Also supports generating plain HTML documentation and manual pages using >> Doxygen. >> >> Co-developed-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx> >> Signed-off-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx> >> Acked-by: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx> >> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx> >> Acked-by: Gregor Jasny <gjasny@xxxxxxxxxxxxxx> >> [Gregor: Control symbol visibility] >> Signed-off-by: Gregor Jasny <gjasny@xxxxxxxxxxxxxx> >> Signed-off-by: Ariel D'Alessandro <ariel@xxxxxxxxxxxxxxxxxxxx> >> --- >> .gitignore | 1 + >> Makefile.am | 3 +- >> README.md | 85 +- >> contrib/Makefile.am | 3 +- >> contrib/cobalt-ctl/Makefile.am | 2 + >> contrib/cobalt-ctl/meson.build | 8 + >> contrib/decode_tm6000/Makefile.am | 2 + >> contrib/decode_tm6000/meson.build | 14 + >> contrib/gconv/Makefile.am | 2 +- >> contrib/gconv/meson.build | 44 + >> contrib/meson.build | 13 + >> contrib/rds-saa6588/Makefile.am | 2 + >> contrib/rds-saa6588/meson.build | 7 + >> contrib/test/Makefile.am | 3 +- >> contrib/test/meson.build | 143 + >> contrib/xc3028-firmware/Makefile.am | 2 +- >> contrib/xc3028-firmware/meson.build | 11 + >> doc/Doxyfile.in | 2351 +++++++++++++++++ > > 2351 lines to add this file?! > > Is this really needed? And if so, please add this in a separate patch in the > next version. This huge file pollutes the diff, making it very hard to review. Yep, it is needed. That's the Doxygen config template, which is processed and used by meson to generate the docs. BTW, the m4 scripts are already using another Doxygen config template: doxygen_libdvbv5.cfg, which we could remove once we drop Autotools support. The reason to add this new file (doc/Doxyfile.in) is that the syntax for variable substitution is not shared between the two build systems. While m4 uses $(variable), meson supports ${variable} and @variable@, see [0]. Anyway, I agree with you in that Doxygen support should be split. Will do in patchset v4. Thanks, Ariel [0] https://mesonbuild.com/Reference-manual.html#configure_file