From 7c512cc76745eeee6a138358be1dc5ef5e720beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Thu, 6 Nov 2025 11:53:53 +0100 Subject: [PATCH] meson: Install the camlibs documentation Do as in autotools and install the camlib README files. Also add the install_tag to all installation targets to allow automatic packaging. --- camlibs/adc65/meson.build | 6 ++++++ camlibs/agfa-cl20/meson.build | 6 ++++++ camlibs/aox/meson.build | 6 ++++++ camlibs/ax203/meson.build | 7 +++++++ camlibs/canon/meson.build | 6 ++++++ camlibs/clicksmart310/meson.build | 6 ++++++ camlibs/digigr8/meson.build | 10 ++++++++++ camlibs/enigma13/meson.build | 6 ++++++ camlibs/gsmart300/meson.build | 6 ++++++ camlibs/iclick/meson.build | 6 ++++++ camlibs/jamcam/meson.build | 6 ++++++ camlibs/jl2005a/meson.build | 6 ++++++ camlibs/jl2005c/meson.build | 7 +++++++ camlibs/konica/meson.build | 7 +++++++ camlibs/largan/lmini/meson.build | 6 ++++++ camlibs/lg_gsm/meson.build | 6 ++++++ camlibs/lumix/meson.build | 6 ++++++ camlibs/mars/meson.build | 6 ++++++ camlibs/minolta/dimagev/meson.build | 6 ++++++ camlibs/mustek/meson.build | 6 ++++++ camlibs/panasonic/coolshot/meson.build | 6 ++++++ camlibs/panasonic/l859/meson.build | 6 ++++++ camlibs/panasonic/meson.build | 6 ++++++ camlibs/pccam300/meson.build | 6 ++++++ camlibs/pccam600/meson.build | 6 ++++++ camlibs/pentax/meson.build | 6 ++++++ camlibs/ptp2/meson.build | 6 ++++++ camlibs/smal/meson.build | 6 ++++++ camlibs/sonix/meson.build | 6 ++++++ camlibs/sonydscf1/meson.build | 6 ++++++ camlibs/soundvision/meson.build | 6 ++++++ camlibs/spca50x/meson.build | 6 ++++++ camlibs/sq905/meson.build | 7 +++++++ camlibs/st2205/meson.build | 7 +++++++ camlibs/toshiba/pdrm11/meson.build | 6 ++++++ camlibs/tp6801/meson.build | 6 ++++++ doc/meson.build | 6 ++---- meson.build | 3 +++ packaging/generic/meson.build | 3 ++- 39 files changed, 232 insertions(+), 5 deletions(-) diff --git a/camlibs/adc65/meson.build b/camlibs/adc65/meson.build index 506cf1df4..788befab9 100644 --- a/camlibs/adc65/meson.build +++ b/camlibs/adc65/meson.build @@ -8,4 +8,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.adc65', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/agfa-cl20/meson.build b/camlibs/agfa-cl20/meson.build index 43b50d68e..18180bcc8 100644 --- a/camlibs/agfa-cl20/meson.build +++ b/camlibs/agfa-cl20/meson.build @@ -8,4 +8,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.agfa-cl20', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/aox/meson.build b/camlibs/aox/meson.build index 69260d3e0..894e178f2 100644 --- a/camlibs/aox/meson.build +++ b/camlibs/aox/meson.build @@ -9,4 +9,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.aox', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/ax203/meson.build b/camlibs/ax203/meson.build index ff13fabcc..4177f3440 100644 --- a/camlibs/ax203/meson.build +++ b/camlibs/ax203/meson.build @@ -20,4 +20,11 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.ax203', + 'README.ax203-compression', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/canon/meson.build b/camlibs/canon/meson.build index d37bf966d..4995a6e53 100644 --- a/camlibs/canon/meson.build +++ b/camlibs/canon/meson.build @@ -18,4 +18,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.canon', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/clicksmart310/meson.build b/camlibs/clicksmart310/meson.build index d2eb64190..4470d0eb6 100644 --- a/camlibs/clicksmart310/meson.build +++ b/camlibs/clicksmart310/meson.build @@ -11,4 +11,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.clicksmart310', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/digigr8/meson.build b/camlibs/digigr8/meson.build index 7bca4a927..3ad9e6210 100644 --- a/camlibs/digigr8/meson.build +++ b/camlibs/digigr8/meson.build @@ -11,4 +11,14 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.9050', + 'README.9051', + 'README.9052', + 'README.905C', + 'README.913D', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/enigma13/meson.build b/camlibs/enigma13/meson.build index 5771461ee..42b53025d 100644 --- a/camlibs/enigma13/meson.build +++ b/camlibs/enigma13/meson.build @@ -7,4 +7,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.enigma13', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/gsmart300/meson.build b/camlibs/gsmart300/meson.build index 91e200444..bce4d330e 100644 --- a/camlibs/gsmart300/meson.build +++ b/camlibs/gsmart300/meson.build @@ -11,4 +11,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.gsmart300', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/iclick/meson.build b/camlibs/iclick/meson.build index f57887180..d5a5afef2 100644 --- a/camlibs/iclick/meson.build +++ b/camlibs/iclick/meson.build @@ -9,4 +9,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.iclick', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/jamcam/meson.build b/camlibs/jamcam/meson.build index 06b3330db..a81805b12 100644 --- a/camlibs/jamcam/meson.build +++ b/camlibs/jamcam/meson.build @@ -9,4 +9,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.jamcam', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/jl2005a/meson.build b/camlibs/jl2005a/meson.build index 8c61f1629..f20d3974c 100644 --- a/camlibs/jl2005a/meson.build +++ b/camlibs/jl2005a/meson.build @@ -10,4 +10,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.jl2005a', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/jl2005c/meson.build b/camlibs/jl2005c/meson.build index be2d684d8..84e50a3db 100644 --- a/camlibs/jl2005c/meson.build +++ b/camlibs/jl2005c/meson.build @@ -16,4 +16,11 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.jl2005c', + 'README.jl2005bcd-compression', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/konica/meson.build b/camlibs/konica/meson.build index a53c1373f..c13a56c85 100644 --- a/camlibs/konica/meson.build +++ b/camlibs/konica/meson.build @@ -10,6 +10,7 @@ install_data( 'localization/spanish', ), install_dir: konica_localization_dir, + install_tag: 'i18n', ) shared_module( @@ -42,4 +43,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.konica', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/largan/lmini/meson.build b/camlibs/largan/lmini/meson.build index 723e4434b..8c496f9b9 100644 --- a/camlibs/largan/lmini/meson.build +++ b/camlibs/largan/lmini/meson.build @@ -11,4 +11,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.largan-lmini', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/lg_gsm/meson.build b/camlibs/lg_gsm/meson.build index 0f71ad3cf..a4eb22400 100644 --- a/camlibs/lg_gsm/meson.build +++ b/camlibs/lg_gsm/meson.build @@ -10,4 +10,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.lg_gsm', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/lumix/meson.build b/camlibs/lumix/meson.build index 85eab008d..69fc3b7db 100644 --- a/camlibs/lumix/meson.build +++ b/camlibs/lumix/meson.build @@ -9,4 +9,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.lumix', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/mars/meson.build b/camlibs/mars/meson.build index c86027fcb..e7b4737d0 100644 --- a/camlibs/mars/meson.build +++ b/camlibs/mars/meson.build @@ -10,4 +10,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.mars', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/minolta/dimagev/meson.build b/camlibs/minolta/dimagev/meson.build index 445cb96dd..74b81376f 100644 --- a/camlibs/minolta/dimagev/meson.build +++ b/camlibs/minolta/dimagev/meson.build @@ -17,4 +17,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.minolta-dimagev', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/mustek/meson.build b/camlibs/mustek/meson.build index ab934f568..1a75498d6 100644 --- a/camlibs/mustek/meson.build +++ b/camlibs/mustek/meson.build @@ -19,4 +19,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.mustek', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/panasonic/coolshot/meson.build b/camlibs/panasonic/coolshot/meson.build index bd560f8cf..c275b9ffe 100644 --- a/camlibs/panasonic/coolshot/meson.build +++ b/camlibs/panasonic/coolshot/meson.build @@ -9,4 +9,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.panasonic-coolshot', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/panasonic/l859/meson.build b/camlibs/panasonic/l859/meson.build index c7e170f9e..094c3cd71 100644 --- a/camlibs/panasonic/l859/meson.build +++ b/camlibs/panasonic/l859/meson.build @@ -8,4 +8,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.panasonic-l859', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/panasonic/meson.build b/camlibs/panasonic/meson.build index 23a070001..af7ff999f 100644 --- a/camlibs/panasonic/meson.build +++ b/camlibs/panasonic/meson.build @@ -27,5 +27,11 @@ shared_module( install_dir: camlibs_dir, ) +install_data( + 'README.panasonic', + install_dir: camlibdoc_dir, + install_tag: 'doc', +) + subdir('coolshot') subdir('l859') \ No newline at end of file diff --git a/camlibs/pccam300/meson.build b/camlibs/pccam300/meson.build index 49caa1b55..7329c91b3 100644 --- a/camlibs/pccam300/meson.build +++ b/camlibs/pccam300/meson.build @@ -9,4 +9,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.pccam300', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/pccam600/meson.build b/camlibs/pccam600/meson.build index 700532563..d0d48bb96 100644 --- a/camlibs/pccam600/meson.build +++ b/camlibs/pccam600/meson.build @@ -9,4 +9,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.pccam600', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/pentax/meson.build b/camlibs/pentax/meson.build index 1ea4eef1d..40e4af462 100644 --- a/camlibs/pentax/meson.build +++ b/camlibs/pentax/meson.build @@ -28,4 +28,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.pentax', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/ptp2/meson.build b/camlibs/ptp2/meson.build index cb1c57150..e99a5791a 100644 --- a/camlibs/ptp2/meson.build +++ b/camlibs/ptp2/meson.build @@ -27,4 +27,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.ptp2', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/smal/meson.build b/camlibs/smal/meson.build index 6fb372f74..ff5fb00d5 100644 --- a/camlibs/smal/meson.build +++ b/camlibs/smal/meson.build @@ -11,4 +11,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.smal', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/sonix/meson.build b/camlibs/sonix/meson.build index c05bed894..24f4a2a67 100644 --- a/camlibs/sonix/meson.build +++ b/camlibs/sonix/meson.build @@ -10,4 +10,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.sonix', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/sonydscf1/meson.build b/camlibs/sonydscf1/meson.build index 3df61a6e3..d8e13222e 100644 --- a/camlibs/sonydscf1/meson.build +++ b/camlibs/sonydscf1/meson.build @@ -10,4 +10,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.sonydscf1', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/soundvision/meson.build b/camlibs/soundvision/meson.build index e84396100..ac3204a93 100644 --- a/camlibs/soundvision/meson.build +++ b/camlibs/soundvision/meson.build @@ -12,4 +12,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.soundvision', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/spca50x/meson.build b/camlibs/spca50x/meson.build index 823ed5ae8..d8f809b01 100644 --- a/camlibs/spca50x/meson.build +++ b/camlibs/spca50x/meson.build @@ -16,4 +16,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.spca50x', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/sq905/meson.build b/camlibs/sq905/meson.build index e3ce265b1..f93a3ca0a 100644 --- a/camlibs/sq905/meson.build +++ b/camlibs/sq905/meson.build @@ -10,4 +10,11 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.913C', + 'README.sq905', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/st2205/meson.build b/camlibs/st2205/meson.build index 2c77601a3..cd113abc5 100644 --- a/camlibs/st2205/meson.build +++ b/camlibs/st2205/meson.build @@ -12,4 +12,11 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.st2205', + 'README.st2205-compression', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/toshiba/pdrm11/meson.build b/camlibs/toshiba/pdrm11/meson.build index 646bd20f6..6443da66d 100644 --- a/camlibs/toshiba/pdrm11/meson.build +++ b/camlibs/toshiba/pdrm11/meson.build @@ -9,4 +9,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.toshiba-pdrm11', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/camlibs/tp6801/meson.build b/camlibs/tp6801/meson.build index a8d9d658a..5fa86c8d2 100644 --- a/camlibs/tp6801/meson.build +++ b/camlibs/tp6801/meson.build @@ -10,4 +10,10 @@ shared_module( name_prefix: '', install: true, install_dir: camlibs_dir, +) + +install_data( + 'README.tp6801', + install_dir: camlibdoc_dir, + install_tag: 'doc', ) \ No newline at end of file diff --git a/doc/meson.build b/doc/meson.build index 73639fc64..ce17e32f7 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -21,8 +21,6 @@ if get_option('docs') cdata_internals = cdata cdata_internals.set('HTML_APIDOC_INTERNALS_DIR', 'html-internals') - datadir = join_paths(get_option('datadir'), 'doc', meson.project_name()) - doxyfile = configure_file( input: 'Doxyfile.in', output: 'Doxyfile', @@ -36,7 +34,7 @@ if get_option('docs') output: 'html', command: [doxygen, '@INPUT@'], install: true, - install_dir: datadir + install_dir: doc_dir ) if get_option('docs-internal') @@ -53,7 +51,7 @@ if get_option('docs') output: 'html-internals', command: [doxygen, '@INPUT@'], install: true, - install_dir: datadir + install_dir: doc_dir ) endif endif diff --git a/meson.build b/meson.build index 6d08881f5..55d3a116c 100644 --- a/meson.build +++ b/meson.build @@ -194,6 +194,9 @@ has_version_script = cc.has_link_argument('-Wl,--version-script=@0@'.format( libgphoto2_root_inc = include_directories('.') +doc_dir = get_option('prefix') / get_option('datadir') / 'doc' / '@0@-@1@'.format(meson.project_name(), libgphoto2_current_min) +camlibdoc_dir = doc_dir / 'camlibs' + iolibs_dir_suffix = libgphoto2_port_name / libgphoto2_port_version iolibs_dir = get_option('prefix') / get_option('libdir') / iolibs_dir_suffix diff --git a/packaging/generic/meson.build b/packaging/generic/meson.build index 097c91577..699dbdaae 100644 --- a/packaging/generic/meson.build +++ b/packaging/generic/meson.build @@ -12,6 +12,7 @@ if target_machine.system() in ['linux'] install_data( 'check-ptp-camera', - install_dir: udev_script_dir + install_dir: udev_script_dir, + install_tag: 'bin', ) endif \ No newline at end of file