[gtk-vnc] meson: set cflags directly on targets

[Daniel P. Berrange <dberrange src gnome org>]

commit e22c82d263e4d77adaf9e7945a6a2d616cd4cc80
Author: Daniel P. Berrangé <dan berrange com>
Date:   Wed Mar 31 14:45:54 2021 +0100

    meson: set cflags directly on targets
    
    Setting the cflags globally causes them to be picked up by g-ir-scanner
    which is not desired.
    
    Signed-off-by: Daniel P. Berrangé <berrange redhat com>

 examples/meson.build |  3 ++-
 meson.build          | 11 +++++------
 src/meson.build      | 12 ++++++------
 tools/meson.build    |  3 ++-
 4 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/examples/meson.build b/examples/meson.build
index ebdff41..ca0a120 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -8,7 +8,8 @@ endif
 gvncviewer = executable(
   'gvncviewer',
   sources: ['gvncviewer.c'],
-  c_args: gtk_vnc_version_check_flags,
+  c_args: warning_cflags + gtk_vnc_version_check_flags,
+  link_args: warning_ldflags,
   dependencies: gvncviewer_deps,
   install: false,
 )
diff --git a/meson.build b/meson.build
index b3fd98b..d48db12 100644
--- a/meson.build
+++ b/meson.build
@@ -238,11 +238,12 @@ check_cflags = [
   '-Wno-suggest-attribute=const',
 ]
 
+warning_cflags = []
+warning_ldflags = []
 if get_option('warning_level') == '2'
-  cflags = []
   foreach cflag: check_cflags
     if cc.has_argument(cflag)
-      cflags += [cflag]
+      warning_cflags += [cflag]
     endif
   endforeach
 
@@ -252,16 +253,14 @@ if get_option('warning_level') == '2'
       '-fstack-protector-strong',
       '-fstack-protector-all',
     ])
-    cflags += fstack_cflags
+    warning_cflags += fstack_cflags
 
     # When building with mingw using -fstack-protector requires libssp library
     # which is included by using -fstack-protector with linker.
     if fstack_cflags.length() == 1 and host_machine.system() == 'windows'
-      add_project_link_arguments(fstack_cflags, language: 'c')
+      warning_ldflags = fstack_cflags
     endif
   endif
-
-  add_project_arguments(cflags, language: 'c')
 endif
 
 gtk_vnc_prefix = get_option('prefix')
diff --git a/src/meson.build b/src/meson.build
index 8469df5..d3ff69b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -129,8 +129,8 @@ gvnc = library(
   sources: gvnc_sources,
   dependencies: gvnc_deps,
   include_directories: gvnc_inc,
-  c_args: gvnc_version_check_flags,
-  link_args: gvnc_link_args,
+  c_args: warning_cflags + gvnc_version_check_flags,
+  link_args: warning_ldflags + gvnc_link_args,
   link_depends: gvnc_syms,
   version: '0.0.1',
   darwin_versions: ['1.0', '1.1'],
@@ -214,8 +214,8 @@ if libpulse_dep.found()
     sources: gvncpulse_sources,
     dependencies: gvncpulse_deps,
     include_directories: gvncpulse_inc,
-    c_args: gvnc_version_check_flags,
-    link_args: gvncpulse_link_args,
+    c_args: warning_cflags + gvnc_version_check_flags,
+    link_args: warning_ldflags + gvncpulse_link_args,
     link_depends: gvncpulse_syms,
     version: '0.0.1',
     darwin_versions: ['1.0', '1.1'],
@@ -379,8 +379,8 @@ gtk_vnc = library(
   sources: gtk_vnc_sources,
   dependencies: gtk_vnc_deps,
   include_directories: gtk_vnc_inc,
-  c_args: gtk_vnc_version_check_flags,
-  link_args: gtk_vnc_link_args,
+  c_args: warning_cflags + gtk_vnc_version_check_flags,
+  link_args: warning_ldflags + gtk_vnc_link_args,
   link_depends: gtk_vnc_syms,
   version: '0.0.2',
   darwin_versions: ['1.0', '1.2'],
diff --git a/tools/meson.build b/tools/meson.build
index f54e6a5..d59976d 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -4,7 +4,8 @@ gvnccapture = executable(
   'gvnccapture',
   dependencies: [gvnc_dep],
   sources: ['gvnccapture.c'],
-  c_args: gvnc_version_check_flags,
+  c_args: warning_cflags + gvnc_version_check_flags,
+  link_args: warning_ldflags,
   install: true,
   install_dir: gtk_vnc_bindir,
 )