|
 |
73b847 |
From 73b62b67c55639f4184f2c2de228b68f21093768 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
73b847 |
Date: Mon, 16 Dec 2019 19:02:00 +0100
|
|
|
73b847 |
Subject: [PATCH 142/181] meson: Use more meson's project_name()
|
|
|
73b847 |
|
|
|
73b847 |
Not that libfprint is long to write, but in case we'll ever change the
|
|
|
73b847 |
basename, we do it once.
|
|
|
73b847 |
---
|
|
|
73b847 |
doc/meson.build | 2 +-
|
|
|
73b847 |
doc/xml/meson.build | 6 +++---
|
|
|
73b847 |
libfprint/meson.build | 4 +++-
|
|
|
73b847 |
meson.build | 6 +++---
|
|
|
73b847 |
4 files changed, 10 insertions(+), 8 deletions(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/doc/meson.build b/doc/meson.build
|
|
|
73b847 |
index bed320d..2c7a384 100644
|
|
|
73b847 |
--- a/doc/meson.build
|
|
|
73b847 |
+++ b/doc/meson.build
|
|
|
73b847 |
@@ -24,7 +24,7 @@ glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
|
|
|
73b847 |
glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
|
|
|
73b847 |
docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html')
|
|
|
73b847 |
|
|
|
73b847 |
-gnome.gtkdoc('libfprint',
|
|
|
73b847 |
+gnome.gtkdoc(meson.project_name(),
|
|
|
73b847 |
main_xml: 'libfprint-docs.xml',
|
|
|
73b847 |
src_dir: join_paths(meson.source_root(), 'libfprint'),
|
|
|
73b847 |
dependencies: libfprint_dep,
|
|
|
73b847 |
diff --git a/doc/xml/meson.build b/doc/xml/meson.build
|
|
|
73b847 |
index 2ca1100..5e56bb4 100644
|
|
|
73b847 |
--- a/doc/xml/meson.build
|
|
|
73b847 |
+++ b/doc/xml/meson.build
|
|
|
73b847 |
@@ -1,8 +1,8 @@
|
|
|
73b847 |
ent_conf = configuration_data()
|
|
|
73b847 |
-ent_conf.set('PACKAGE', 'libfprint')
|
|
|
73b847 |
+ent_conf.set('PACKAGE', meson.project_name())
|
|
|
73b847 |
ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/libfprint/libfprint/issues')
|
|
|
73b847 |
-ent_conf.set('PACKAGE_NAME', 'libfprint')
|
|
|
73b847 |
-ent_conf.set('PACKAGE_STRING', 'libfprint')
|
|
|
73b847 |
+ent_conf.set('PACKAGE_NAME', meson.project_name())
|
|
|
73b847 |
+ent_conf.set('PACKAGE_STRING', meson.project_name())
|
|
|
73b847 |
ent_conf.set('PACKAGE_TARNAME', 'libfprint-' + meson.project_version())
|
|
|
73b847 |
ent_conf.set('PACKAGE_URL', 'https://fprint.freedesktop.org/')
|
|
|
73b847 |
ent_conf.set('PACKAGE_VERSION', meson.project_version())
|
|
|
73b847 |
diff --git a/libfprint/meson.build b/libfprint/meson.build
|
|
|
73b847 |
index 23ab60a..210e45c 100644
|
|
|
73b847 |
--- a/libfprint/meson.build
|
|
|
73b847 |
+++ b/libfprint/meson.build
|
|
|
73b847 |
@@ -251,7 +251,9 @@ libfprint_dep = declare_dependency(link_with: libfprint,
|
|
|
73b847 |
gusb_dep,
|
|
|
73b847 |
])
|
|
|
73b847 |
|
|
|
73b847 |
-install_headers(['fprint.h'] + libfprint_public_headers, subdir: 'libfprint')
|
|
|
73b847 |
+install_headers(['fprint.h'] + libfprint_public_headers,
|
|
|
73b847 |
+ subdir: meson.project_name()
|
|
|
73b847 |
+)
|
|
|
73b847 |
|
|
|
73b847 |
libfprint_private_dep = declare_dependency(
|
|
|
73b847 |
include_directories: include_directories('.'),
|
|
|
73b847 |
diff --git a/meson.build b/meson.build
|
|
|
73b847 |
index 1d101a7..29bdff5 100644
|
|
|
73b847 |
--- a/meson.build
|
|
|
73b847 |
+++ b/meson.build
|
|
|
73b847 |
@@ -203,10 +203,10 @@ subdir('tests')
|
|
|
73b847 |
|
|
|
73b847 |
pkgconfig = import('pkgconfig')
|
|
|
73b847 |
pkgconfig.generate(
|
|
|
73b847 |
- name: 'libfprint',
|
|
|
73b847 |
+ name: meson.project_name(),
|
|
|
73b847 |
description: 'Generic C API for fingerprint reader access',
|
|
|
73b847 |
version: meson.project_version(),
|
|
|
73b847 |
libraries: libfprint,
|
|
|
73b847 |
- subdirs: 'libfprint',
|
|
|
73b847 |
- filebase: 'libfprint2',
|
|
|
73b847 |
+ subdirs: meson.project_name(),
|
|
|
73b847 |
+ filebase: meson.project_name() + '2',
|
|
|
73b847 |
)
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|