From 096748a196965ee781ac01b73b23e7d51b5459e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Wed, 11 Sep 2019 11:10:08 +0200
Subject: meson: Rename cflags variable

The variable holding the compiler flags, `cflags`, has been renamed
to `c_flags` to be consistent with the rest of build files.

Different objects used in the `test-dispatcher-envp` target
have been grouped together.

The dependency over the `libnm` library has been removed as it is
unnecessary.
---
 clients/cli/meson.build          | 4 ++--
 clients/common/meson.build       | 6 +++---
 clients/common/tests/meson.build | 2 +-
 clients/meson.build              | 6 +++---
 clients/tui/meson.build          | 4 ++--
 clients/tui/newt/meson.build     | 2 +-
 meson.build                      | 6 +++---
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/clients/cli/meson.build b/clients/cli/meson.build
index f5ca1c0ab9..d8cb6e2856 100644
--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@@ -26,7 +26,7 @@ deps = [
   readline_dep,
 ]
 
-cflags = clients_cflags + [
+c_flags = clients_c_flags + [
   '-DG_LOG_DOMAIN="@0@"'.format(name),
 ]
 
@@ -40,7 +40,7 @@ executable(
   name,
   sources,
   dependencies: deps,
-  c_args: cflags,
+  c_args: c_flags,
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
   install: true,
diff --git a/clients/common/meson.build b/clients/common/meson.build
index b277f441eb..c7f0e861cd 100644
--- a/clients/common/meson.build
+++ b/clients/common/meson.build
@@ -8,7 +8,7 @@ deps = [
   libnm_nm_default_dep,
 ]
 
-cflags = clients_cflags + [
+c_flags = clients_c_flags + [
   '-DG_LOG_DOMAIN="libnmc"',
 ]
 
@@ -20,7 +20,7 @@ libnmc_base = static_library(
     'nm-vpn-helpers.c',
   ),
   dependencies: deps,
-  c_args: cflags,
+  c_args: c_flags,
 )
 
 libnmc_base_dep = declare_dependency(
@@ -63,7 +63,7 @@ libnmc = static_library(
     'nm-meta-setting-desc.c',
   ) + nm_meta_setting_source + [settings_docs_source],
   dependencies: deps,
-  c_args: cflags,
+  c_args: c_flags,
   link_with: libnmc_base,
   link_depends: settings_docs_source,
 )
diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build
index 061b1fd68d..ea46de50a0 100644
--- a/clients/common/tests/meson.build
+++ b/clients/common/tests/meson.build
@@ -9,7 +9,7 @@ exe = executable(
     libnmc_base_dep,
     libnm_nm_default_dep,
   ],
-  c_args: clients_cflags + [
+  c_args: clients_c_flags + [
     '-DNETWORKMANAGER_COMPILATION_TEST',
   ],
 )
diff --git a/clients/meson.build b/clients/meson.build
index 1c539d98ef..93aa9b15fa 100644
--- a/clients/meson.build
+++ b/clients/meson.build
@@ -5,11 +5,11 @@ deps = [
   libnm_nm_default_dep,
 ]
 
-clients_cflags = [
+clients_c_flags = [
   '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
 ]
 
-cflags = clients_cflags + [
+c_flags = clients_c_flags + [
   '-DG_LOG_DOMAIN="@0@"'.format(name),
 ]
 
@@ -17,7 +17,7 @@ executable(
   name,
   name + '.c',
   dependencies: deps,
-  c_args: cflags,
+  c_args: c_flags,
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
   install: true,
diff --git a/clients/tui/meson.build b/clients/tui/meson.build
index 68162bc00b..a93f41b6f7 100644
--- a/clients/tui/meson.build
+++ b/clients/tui/meson.build
@@ -5,7 +5,7 @@ deps = [
   newt_dep,
 ]
 
-cflags = clients_cflags + [
+c_flags = clients_c_flags + [
   '-DG_LOG_DOMAIN="@0@"'.format(name),
 ]
 
@@ -66,7 +66,7 @@ executable(
   name,
   sources,
   dependencies: deps,
-  c_args: cflags,
+  c_args: c_flags,
   link_with: libnm_systemd_logging_stub,
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
diff --git a/clients/tui/newt/meson.build b/clients/tui/newt/meson.build
index 0b7fde9428..af32247bd9 100644
--- a/clients/tui/newt/meson.build
+++ b/clients/tui/newt/meson.build
@@ -26,7 +26,7 @@ libnmt_newt = static_library(
   sources: sources + [libnm_enum_sources[1]],
   include_directories: libnm_inc,
   dependencies: deps,
-  c_args: cflags,
+  c_args: c_flags,
 )
 
 libnmt_newt_dep = declare_dependency(
diff --git a/meson.build b/meson.build
index a5dea295fa..969ac382d5 100644
--- a/meson.build
+++ b/meson.build
@@ -137,18 +137,18 @@ common_ldflags = []
 
 enable_ld_gc = get_option('ld_gc')
 if enable_ld_gc
-  test_cflags = [
+  test_c_flags = [
     '-fdata-sections',
     '-ffunction-sections',
   ]
 
   test_ldflags = ['-Wl,--gc-sections']
 
-  foreach cflag: test_cflags + test_ldflags
+  foreach cflag: test_c_flags + test_ldflags
     assert(cc.has_argument(cflag), 'Unused symbol eviction requested but not supported. Use -Dld_gc=false to build without it.')
   endforeach
 
-  common_flags += test_cflags
+  common_flags += test_c_flags
   common_ldflags += test_ldflags
 endif
 
-- 
cgit v1.2.1