fixup! Support Meson build system

8 files changed, 20 insertions, 8 deletions

diff --git a/daemon/meson.build b/daemon/meson.build
index 89a0fdde..ccb7edd6 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -48,6 +48,7 @@ gkr_daemon = executable('gnome-keyring-daemon',
   dependencies: gkr_daemon_deps,
   include_directories: config_h_inc,
   install: true,
+  install_rpath: gkr_pkglibdir,
 )
 
 # Desktop files
diff --git a/pkcs11/gkm/meson.build b/pkcs11/gkm/meson.build
index 00749016..703f4d23 100644
--- a/pkcs11/gkm/meson.build
+++ b/pkcs11/gkm/meson.build
@@ -59,9 +59,12 @@ libgkm_deps = [
 ]
 
 libgkm = library('gkm',
-  [ libgkm_sources, gkm_marshal, ],
+  name_prefix: '',
+  sources: [ libgkm_sources, gkm_marshal, ],
   dependencies: libgkm_deps,
   include_directories: config_h_inc,
+  install: true,
+  install_dir: gkr_pkglibdir,
 )
 
 libgkm_dep = declare_dependency(
@@ -90,7 +93,7 @@ libgkm_mock_cflags = [
 ]
 
 libgkm_mock = library('gkm-mock',
-  libgkm_mock_sources,
+  sources: libgkm_mock_sources,
   dependencies: libgkm_mock_deps,
   c_args: libgkm_mock_cflags,
   include_directories: config_h_inc,
diff --git a/pkcs11/gnome2-store/meson.build b/pkcs11/gnome2-store/meson.build
index 97376d62..c6054a5c 100644
--- a/pkcs11/gnome2-store/meson.build
+++ b/pkcs11/gnome2-store/meson.build
@@ -15,8 +15,9 @@ libgkm_gnome2_store_deps = [
   libgkm_dep,
 ]
 
-libgkm_gnome2_store = library('gkm-gnome2-store',
+libgkm_gnome2_store = library('gkm-gnome2-store-standalone',
   libgkm_gnome2_store_sources,
+  name_prefix: '',
   dependencies: libgkm_gnome2_store_deps,
   include_directories: config_h_inc,
   install: true,
diff --git a/pkcs11/rpc-layer/meson.build b/pkcs11/rpc-layer/meson.build
index b1ed8937..39f63bb2 100644
--- a/pkcs11/rpc-layer/meson.build
+++ b/pkcs11/rpc-layer/meson.build
@@ -13,8 +13,9 @@ libgkm_rpc_layer_deps = [
   libgkm_dep,
 ]
 
-libgkm_rpc_layer = library('gkm-rpc-layer',
+libgkm_rpc_layer = library('gkm-rpc-layer-standalone',
   libgkm_rpc_layer_sources,
+  name_prefix: '',
   dependencies: libgkm_rpc_layer_deps,
   include_directories: config_h_inc,
   install: true,
diff --git a/pkcs11/secret-store/meson.build b/pkcs11/secret-store/meson.build
index e3f73e0e..9042f4ce 100644
--- a/pkcs11/secret-store/meson.build
+++ b/pkcs11/secret-store/meson.build
@@ -20,8 +20,9 @@ libgkm_secret_store_deps = [
   libgkm_dep,
 ]
 
-libgkm_secret_store = library('gkm-secret-store',
+libgkm_secret_store = library('gkm-secret-store-standalone',
   libgkm_secret_store_sources,
+  name_prefix: '',
   dependencies: libgkm_secret_store_deps,
   include_directories: config_h_inc,
   install: true,
diff --git a/pkcs11/ssh-store/meson.build b/pkcs11/ssh-store/meson.build
index 410cfeb1..7d9b6a9d 100644
--- a/pkcs11/ssh-store/meson.build
+++ b/pkcs11/ssh-store/meson.build
@@ -14,8 +14,9 @@ libgkm_ssh_store_deps = [
   libgkm_dep,
 ]
 
-libgkm_ssh_store = library('gkm-ssh-store',
+libgkm_ssh_store = library('gkm-ssh-store-standalone',
   libgkm_ssh_store_sources,
+  name_prefix: '',
   dependencies: libgkm_ssh_store_deps,
   include_directories: config_h_inc,
   install: true,
diff --git a/pkcs11/wrap-layer/meson.build b/pkcs11/wrap-layer/meson.build
index cf4043e5..7303d921 100644
--- a/pkcs11/wrap-layer/meson.build
+++ b/pkcs11/wrap-layer/meson.build
@@ -14,10 +14,13 @@ libgkm_wrap_layer_deps = [
   libgkm_dep,
 ]
 
-libgkm_wrap_layer = library('gkm-wrap-layer',
+libgkm_wrap_layer = library('gkm-wrap-layer-standalone',
   libgkm_wrap_layer_sources,
+  name_prefix: '',
   dependencies: libgkm_wrap_layer_deps,
   include_directories: config_h_inc,
+  install: true,
+  install_dir: gkr_pkglibdir,
 )
 
 libgkm_wrap_layer_dep = declare_dependency(
diff --git a/pkcs11/xdg-store/meson.build b/pkcs11/xdg-store/meson.build
index 19f9f2f1..71115377 100644
--- a/pkcs11/xdg-store/meson.build
+++ b/pkcs11/xdg-store/meson.build
@@ -14,8 +14,9 @@ libgkm_xdg_store_deps = [
   libgkm_dep,
 ]
 
-libgkm_xdg_store = library('gkm-xdg-store',
+libgkm_xdg_store = library('gkm-xdg-store-standalone',
   libgkm_xdg_store_sources,
+  name_prefix: '',
   dependencies: libgkm_xdg_store_deps,
   include_directories: config_h_inc,
   install: true,