108 lines
3.3 KiB
Diff
108 lines
3.3 KiB
Diff
From c23e2719bac6d5b1c832ce06d4bc2358f532eb19 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
Date: Wed, 4 Dec 2019 12:32:14 +0100
|
|
Subject: [PATCH 069/181] meson: Use add_project_arguments for common cflags
|
|
|
|
We were passing around the common cflags and setting them for each library
|
|
or executable, but this is just a repetition given we can just use
|
|
add_project_arguments for this.
|
|
---
|
|
demo/meson.build | 5 +----
|
|
examples/meson.build | 6 ++----
|
|
libfprint/meson.build | 2 +-
|
|
meson.build | 13 ++++++++-----
|
|
4 files changed, 12 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/demo/meson.build b/demo/meson.build
|
|
index bf7a7ee..279a43c 100644
|
|
--- a/demo/meson.build
|
|
+++ b/demo/meson.build
|
|
@@ -13,10 +13,7 @@ executable('gtk-libfprint-test',
|
|
include_directories: [
|
|
root_inc,
|
|
],
|
|
- c_args: [
|
|
- common_cflags,
|
|
- '-DPACKAGE_VERSION="' + meson.project_version() + '"'
|
|
- ],
|
|
+ c_args: '-DPACKAGE_VERSION="' + meson.project_version() + '"',
|
|
install: true,
|
|
install_dir: bindir)
|
|
|
|
diff --git a/examples/meson.build b/examples/meson.build
|
|
index ff03ac6..eef8c3f 100644
|
|
--- a/examples/meson.build
|
|
+++ b/examples/meson.build
|
|
@@ -6,8 +6,7 @@ foreach example: examples
|
|
dependencies: [ libfprint_dep, glib_dep ],
|
|
include_directories: [
|
|
root_inc,
|
|
- ],
|
|
- c_args: common_cflags)
|
|
+ ])
|
|
endforeach
|
|
|
|
executable('cpp-test',
|
|
@@ -15,5 +14,4 @@ executable('cpp-test',
|
|
dependencies: libfprint_dep,
|
|
include_directories: [
|
|
root_inc,
|
|
- ],
|
|
- c_args: common_cflags)
|
|
+ ])
|
|
diff --git a/libfprint/meson.build b/libfprint/meson.build
|
|
index f77965a..964744e 100644
|
|
--- a/libfprint/meson.build
|
|
+++ b/libfprint/meson.build
|
|
@@ -188,7 +188,7 @@ libfprint = library('fprint',
|
|
drivers_sources + nbis_sources + other_sources,
|
|
soversion: soversion,
|
|
version: libversion,
|
|
- c_args: common_cflags + drivers_cflags,
|
|
+ c_args: drivers_cflags,
|
|
include_directories: [
|
|
root_inc,
|
|
include_directories('nbis/include'),
|
|
diff --git a/meson.build b/meson.build
|
|
index 54761c4..09abc1f 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -10,9 +10,6 @@ project('libfprint', [ 'c', 'cpp' ],
|
|
|
|
gnome = import('gnome')
|
|
|
|
-add_project_arguments([ '-D_GNU_SOURCE' ], language: 'c')
|
|
-add_project_arguments([ '-DG_LOG_DOMAIN="libfprint"' ], language: 'c')
|
|
-
|
|
libfprint_conf = configuration_data()
|
|
|
|
cc = meson.get_compiler('c')
|
|
@@ -23,8 +20,6 @@ glib_min_version = '2.56'
|
|
glib_version_def = 'GLIB_VERSION_@0@_@1@'.format(
|
|
glib_min_version.split('.')[0], glib_min_version.split('.')[1])
|
|
common_cflags = cc.get_supported_arguments([
|
|
- '-fgnu89-inline',
|
|
- '-std=gnu99',
|
|
'-Wall',
|
|
'-Wtype-limits',
|
|
'-Wundef',
|
|
@@ -34,7 +29,15 @@ common_cflags = cc.get_supported_arguments([
|
|
'-Wshadow',
|
|
'-DGLIB_VERSION_MIN_REQUIRED=' + glib_version_def,
|
|
'-DGLIB_VERSION_MAX_ALLOWED=' + glib_version_def,
|
|
+ '-D_GNU_SOURCE',
|
|
+ '-DG_LOG_DOMAIN="libfprint"',
|
|
+])
|
|
+c_cflags = cc.get_supported_arguments([
|
|
+ '-fgnu89-inline',
|
|
+ '-std=gnu99',
|
|
])
|
|
+add_project_arguments(common_cflags + c_cflags, language: 'c')
|
|
+add_project_arguments(common_cflags, language: 'cpp')
|
|
|
|
# maintaining compatibility with the previous libtool versioning
|
|
# current = binary - interface
|
|
--
|
|
2.24.1
|
|
|