exchange

commit 22f6c07fa2c8900781fc63410a5b886a511c2709
parent 34d6fbe9cf25c943f2776e9f46730c2b88c7eadb
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Fri, 10 Apr 2026 13:42:39 +0200

build: meson format and do not rely on meson.build in prebuilt

Diffstat:
M
doc/meson.build
 | 
32
++++++++++++++++++++++++++++++--
M
meson.build
 | 
5
+----
M
src/auditordb/meson.build
 | 
18
+++++++-----------
M
src/testing/meson.build
 | 
34
+++++++++++++++++-----------------
M
src/util/meson.build
 | 
6
+-----

5 files changed, 56 insertions(+), 39 deletions(-)
diff --git a/doc/meson.build b/doc/meson.build
@@ -1,6 +1,4 @@
 # This build file is in the public domain
-subdir('prebuilt')
-
 install_man(
     [
         'prebuilt' / 'man' / 'taler-aggregator-benchmark.1',
@@ -63,3 +61,33 @@ install_data(
     install_dir: get_option('infodir') / 'taler-exchange-figures',
 )
 
+fs = import('fs')
+
+makeinfo = find_program('makeinfo', native: true, required: false)
+
+if makeinfo.found()
+
+    foreach f : ['taler-auditor', 'taler-developer-manual', 'taler-exchange']
+        f_texi = '@0@.texi'.format(f)
+        fs.copyfile('prebuilt' / 'texinfo' / f_texi, f_texi)
+
+        f_info = '@0@.info'.format(f)
+
+        custom_target(
+            f_info,
+            output: f_info,
+            command: [
+                makeinfo,
+                '--no-split',
+                '--no-headers',
+                meson.current_build_dir() / f_texi,
+                '-o',
+                '@OUTPUT0@',
+            ],
+            install: true,
+            install_dir: get_option('infodir'),
+        )
+    endforeach
+endif
+
+
diff --git a/meson.build b/meson.build
@@ -352,10 +352,7 @@ if not get_option('only-doc')
     private_config.set_quoted('VERSION', meson.project_version())
     private_config.set_quoted('VCS_VERSION', 'mesonbuild')
     private_config.set_quoted('PACKAGE_BUGREPORT', 'taler@gnu.org')
-    configure_file(
-        output: 'taler_config.h',
-        configuration: private_config,
-    )
+    configure_file(output: 'taler_config.h', configuration: private_config)
     configuration_inc = include_directories('.')
 
     cdata = configuration_data()
diff --git a/src/auditordb/meson.build b/src/auditordb/meson.build
@@ -131,11 +131,11 @@ libtalerauditordb = library(
     version: solibversions['libtalerauditordb']['soversion'],
     install_rpath: rpath_option,
     dependencies: [
-         libtalerpq_dep,
-         libtalerutil_dep,
-         gnunetpq_dep,
-         gnunetutil_dep,
-         pq_dep,
+        libtalerpq_dep,
+        libtalerutil_dep,
+        gnunetpq_dep,
+        gnunetutil_dep,
+        pq_dep,
     ],
     include_directories: [incdir, configuration_inc],
     install: true,
@@ -152,9 +152,7 @@ pkg.generate(
 
 test_auditordb_checkpoints = executable(
     'test_auditordb_checkpoints-postgres',
-    [
-        'test_auditordb_checkpoints.c'
-    ],
+    ['test_auditordb_checkpoints.c'],
     install_rpath: rpath_option,
     dependencies: [
         libtalerutil_dep,
@@ -178,9 +176,7 @@ test(
 
 test_auditordb = executable(
     'test_auditordb-postgres',
-    [
-        'test_auditordb.c'
-    ],
+    ['test_auditordb.c'],
     install_rpath: rpath_option,
     dependencies: [
         libtalerutil_dep,
diff --git a/src/testing/meson.build b/src/testing/meson.build
@@ -143,23 +143,23 @@ if twister_dep.found()
         version: solibversions['libtalertwistertesting']['soversion'],
         install_rpath: rpath_option,
         dependencies: [
-             libtalertesting_dep,
-             libtalerbank_dep,
-             libtalerfakebank_dep,
-             libtalerauditor_dep,
-             libtalerexchange_dep,
-             libtalerexchangedb_dep,
-             libtalerextensions_dep,
-             libtalermhd_dep,
-             libtalerjson_dep,
-             libtalerutil_dep,
-             twister_dep,
-             gnunetjson_dep,
-             gnunetcurl_dep,
-             gnunetutil_dep,
-             json_dep,
-             mhd_dep,
-             curl_dep,  
+            libtalertesting_dep,
+            libtalerbank_dep,
+            libtalerfakebank_dep,
+            libtalerauditor_dep,
+            libtalerexchange_dep,
+            libtalerexchangedb_dep,
+            libtalerextensions_dep,
+            libtalermhd_dep,
+            libtalerjson_dep,
+            libtalerutil_dep,
+            twister_dep,
+            gnunetjson_dep,
+            gnunetcurl_dep,
+            gnunetutil_dep,
+            json_dep,
+            mhd_dep,
+            curl_dep,
         ],
         include_directories: [incdir, configuration_inc],
         install: true,
diff --git a/src/util/meson.build b/src/util/meson.build
@@ -34,11 +34,7 @@ exchange_helper_configs = [
 ]
 
 foreach c : exchange_helper_configs
-    configure_file(
-        input: c,
-        output: c,
-        copy: true,
-    )
+    configure_file(input: c, output: c, copy: true)
 endforeach
 
 libtalerutil_src = [