summaryrefslogtreecommitdiff
path: root/service/meson.build
diff options
context:
space:
mode:
Diffstat (limited to 'service/meson.build')
-rw-r--r--service/meson.build34
1 files changed, 13 insertions, 21 deletions
diff --git a/service/meson.build b/service/meson.build
index f651e25..342c883 100644
--- a/service/meson.build
+++ b/service/meson.build
@@ -1,13 +1,3 @@
-dbus_service_dir = get_option('with-dbus-service-dir').strip()
-if dbus_service_dir == ''
- dbus_service_dir = join_paths(dconf_datadir, 'dbus-1', 'services')
-endif
-
-dbus_system_service_dir = get_option('with-dbus-system-service-dir').strip()
-if dbus_system_service_dir == ''
- dbus_system_service_dir = join_paths(dconf_datadir, 'dbus-1', 'system-services')
-endif
-
service_conf = configuration_data()
service_conf.set('libexecdir', dconf_libexecdir)
@@ -16,9 +6,9 @@ service = dconf_namespace + '.service'
configure_file(
input: service + '.in',
output: service,
+ configuration: service_conf,
install: true,
- install_dir: dbus_service_dir,
- configuration: service_conf
+ install_dir: dbus_session_service_dir,
)
sources = [
@@ -28,26 +18,28 @@ sources = [
'dconf-service.c',
'dconf-shm-writer.c',
'dconf-writer.c',
- 'main.c'
+ 'main.c',
]
sources += gnome.gdbus_codegen(
'dconf-generated',
dconf_namespace + '.xml',
interface_prefix: dconf_namespace + '.',
- namespace: 'DConfDBus'
+ namespace: 'DConfDBus',
)
+deps = [
+ gio_unix_dep,
+ libdconf_common_dep,
+ libdconf_shm_dep,
+ libgvdb_dep,
+]
+
executable(
'dconf-service',
sources,
include_directories: top_inc,
- dependencies: gio_unix_dep,
- link_with: [
- libdconf_common,
- libdconf_shm,
- libgvdb
- ],
+ dependencies: deps,
install: true,
- install_dir: dconf_libexecdir
+ install_dir: dconf_libexecdir,
)