build: Use idiomatic Meson

Something that doesn't look like it was written 3 years ago.

3 files changed, 14 insertions, 54 deletions

diff --git a/config.h.meson b/config.h.meson
deleted file mode 100644
index 2c4778b0..00000000
--- a/config.h.meson
+++ /dev/null
@@ -1,35 +0,0 @@
-/* The gettext translation domain */
-#mesondefine GETTEXT_PACKAGE
-
-/* Path to library install prefix */
-#mesondefine INSTALL_PREFIX
-
-/* Define if using seccomp */
-#mesondefine ENABLE_SECCOMP
-
-/* Define to 1 if Bubblewrap support is available */
-#mesondefine HAVE_BWRAP
-
-/* we have the timerfd_create(2) system call */
-#mesondefine HAVE_TIMERFD
-
-/* Define to 1 if you have the `openat' function. */
-#mesondefine HAVE_OPENAT
-
-/* define if libsystemd is available */
-#mesondefine HAVE_SYSTEMD
-
-/* define if udev is available */
-#mesondefine HAVE_UDEV
-
-/* define if libxkbregistry is available */
-#mesondefine HAVE_XKBREGISTRY
-
-/* Define to include GNU extensions */
-#mesondefine _GNU_SOURCE
-
-/* define on systems that have the `uselocale` function */
-#mesondefine HAVE_USELOCALE
-
-/* define on system if OS has extended locale header */
-#mesondefine HAVE_XLOCALE
diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
index 35b4965c..03dcc9ce 100644
--- a/libgnome-desktop/meson.build
+++ b/libgnome-desktop/meson.build
@@ -42,13 +42,8 @@ libgnome_desktop_sources = [
   introspection_sources,
   dbus_xrandr_built_sources,
   dbus_idle_built_sources,
-  'gnome-datetime-source.h',
   'gnome-datetime-source.c',
-  'gnome-rr-private.h',
-  'default-input-sources.h',
-  'meta-xrandr-shared.h',
   'gnome-desktop-thumbnail-script.c',
-  'gnome-desktop-thumbnail-script.h',
   'gnome-gettext-portable.c'
 ]
 
@@ -140,7 +135,7 @@ test_programs = [
   'test-languages'
 ]
 
-foreach program : test_programs
+foreach program: test_programs
   executable(program, program + '.c',
     dependencies: libgnome_desktop_dep,
     install: get_option('debug_tools'),
diff --git a/meson.build b/meson.build
index 1b235169..4a0c450e 100644
--- a/meson.build
+++ b/meson.build
@@ -2,6 +2,9 @@ project('gnome-desktop', 'c',
   meson_version: '>= 0.56.2',
   version: '41.1',
   license: ['GPL-2.0-or-later', 'LGPL-2.1-or-later'],
+  default_options: [
+    'c_std=gnu99',
+  ],
 )
 
 # Before making a release, the libversion string should be modified.
@@ -30,14 +33,14 @@ pkg = import('pkgconfig')
 
 prefix = get_option('prefix')
 
-datadir = join_paths(prefix, get_option('datadir'))
-libexecdir = join_paths(prefix, get_option('libexecdir'))
+datadir = prefix / get_option('datadir')
+libexecdir = prefix / get_option('libexecdir')
 
-liblocaledir = join_paths(get_option('prefix'), 'lib', 'locale')
-localedir = join_paths(datadir, 'locale')
-test_metadir = join_paths(datadir, 'installed-tests', meson.project_name())
-test_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name())
-versiondir = join_paths(datadir, 'gnome')
+liblocaledir = get_option('prefix') / 'lib/locale'
+localedir = datadir / 'locale'
+test_metadir = datadir / 'installed-tests' / meson.project_name()
+test_execdir = libexecdir / 'installed-tests' / meson.project_name()
+versiondir = datadir / 'gnome'
 
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req)
 gtk_dep = dependency('gtk+-3.0', version: gtk_req)
@@ -48,11 +51,8 @@ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
 fontconfig_dep = dependency('fontconfig')
 xkb_config_dep = dependency('xkeyboard-config')
 xkbregistry_dep = dependency('xkbregistry', required: false)
-
 iso_codes_dep = dependency('iso-codes')
-
 libsystemd_dep = dependency('libsystemd', required: get_option('systemd'))
-
 udev_dep = dependency('libudev', required: get_option('udev'))
 
 # Check for bubblewrap compatible platform
@@ -100,7 +100,6 @@ conf.set('HAVE_XLOCALE', cc.has_header('xlocale.h'))
 config_h = declare_dependency(
   sources: configure_file(
     configuration: conf,
-    input: 'config.h.meson',
     output: 'config.h'
   ),
   include_directories: include_directories('.')
@@ -128,9 +127,10 @@ endif
 version_xml = configure_file(
   configuration: version_conf,
   input: 'gnome-version.xml.in',
-  output: 'gnome-version.xml'
+  output: 'gnome-version.xml',
+  install: true,
+  install_dir: versiondir,
 )
-install_data(version_xml, install_dir: versiondir)
 
 subdir('libgnome-desktop')
 subdir('po')