Merge branch 'meson' into 'master'

Various meson related improvements

See merge request GNOME/dconf!11

1 files changed, 17 insertions, 21 deletions

diff --git a/common/meson.build b/common/meson.build
index c431fe9..6cf38b5 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -3,52 +3,48 @@ common_inc = include_directories('.')
 headers = files(
   'dconf-changeset.h',
   'dconf-enums.h',
-  'dconf-paths.h'
+  'dconf-paths.h',
 )
 
 install_headers(
   headers,
-  subdir: join_paths(meson.project_name(), 'common')
+  subdir: join_paths('dconf', 'common'),
 )
 
-name = meson.project_name() + '-common'
-
 sources = files(
   'dconf-changeset.c',
   'dconf-error.c',
-  'dconf-paths.c'
+  'dconf-paths.c',
 )
 
-cflags = ['-DG_LOG_DOMAIN="@0@"'.format(meson.project_name())]
+cflags = ['-DG_LOG_DOMAIN="dconf"']
 
 libdconf_common = static_library(
-  name,
+  'dconf-common',
   sources: sources,
   include_directories: top_inc,
   dependencies: glib_dep,
-  c_args: cflags
+  c_args: cflags,
+  pic: true,
 )
 
-libdconf_common_shared = static_library(
-  name + '-shared',
-  sources: sources,
-  include_directories: top_inc,
+libdconf_common_dep = declare_dependency(
   dependencies: glib_dep,
-  c_args: cflags,
-  pic: true
+  link_with: libdconf_common,
 )
 
-test_cflag = '-fvisibility=hidden'
-
-if cc.has_argument(test_cflag)
-  cflags += [test_cflag]
-endif
+cflags += cc.get_supported_arguments('-fvisibility=hidden')
 
 libdconf_common_hidden = static_library(
-  name + '-hidden',
+  'dconf-common-hidden',
   sources: sources,
   include_directories: top_inc,
   dependencies: glib_dep,
   c_args: cflags,
-  pic: true
+  pic: true,
+)
+
+libdconf_common_hidden_dep = declare_dependency(
+  dependencies: glib_dep,
+  link_with: libdconf_common_hidden,
 )