build: merge branch 'bg/meson-fixes'

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/226

6 files changed, 27 insertions, 27 deletions

diff --git a/data/meson.build b/data/meson.build
index f496bf0135..9025eae452 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -11,7 +11,6 @@ server = 'server.conf'
 configure_file(
   input: server + '.in',
   output: server,
-  install: true,
   install_dir: join_paths(nm_datadir, 'doc', nm_name, 'examples'),
   configuration: data_conf,
 )
@@ -32,7 +31,6 @@ if install_systemd_unit_dir
     configure_file(
       input: service + '.in',
       output: service,
-      install: true,
       install_dir: systemd_system_unit_dir,
       configuration: data_conf,
     )
diff --git a/dispatcher/meson.build b/dispatcher/meson.build
index da9ac7f292..0706ab07a2 100644
--- a/dispatcher/meson.build
+++ b/dispatcher/meson.build
@@ -13,7 +13,6 @@ service = 'org.freedesktop.nm_dispatcher.service'
 configure_file(
   input: service + '.in',
   output: service,
-  install: true,
   install_dir: dbus_sys_dir,
   configuration: service_conf,
 )
diff --git a/libnm/meson.build b/libnm/meson.build
index 3aa182dd4e..2e65d3bebf 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -224,7 +224,7 @@ if enable_introspection
     extra_args: cflags,
     header: 'NetworkManager.h',
     install: true,
-    depends: libnm_dep,
+    dependencies: libnm_dep,
   )
 
   generate_plugin_docs = join_paths(meson.current_source_dir(), 'generate-plugin-docs.pl')
diff --git a/shared/meson.build b/shared/meson.build
index af903d3c8a..d542804eb4 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -330,24 +330,6 @@ libnm_systemd_shared_no_logging_dep = declare_dependency(
   ],
 )
 
-###############################################################################
-
-exe = executable(
-    'nm-utils/tests/test-shared-general',
-    [ 'nm-utils/tests/test-shared-general.c' ],
-    c_args: [
-        '-DNETWORKMANAGER_COMPILATION_TEST',
-        '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)',
-    ],
-    dependencies: [
-        shared_nm_glib_aux_dep,
-        libnm_systemd_shared_no_logging_dep,
-        shared_c_siphash_dep,
-    ],
-)
-
-test(
-    'shared/nm-utils/tests/test-shared-general',
-    test_script,
-    args: test_args + [exe.full_path()]
-)
+if enable_tests
+  subdir('nm-utils/tests')
+endif
diff --git a/shared/nm-utils/tests/meson.build b/shared/nm-utils/tests/meson.build
new file mode 100644
index 0000000000..e0560f296d
--- /dev/null
+++ b/shared/nm-utils/tests/meson.build
@@ -0,0 +1,22 @@
+test_unit = 'test-shared-general'
+
+exe = executable(
+  test_unit,
+  test_unit + '.c',
+  c_args: [
+    '-DNETWORKMANAGER_COMPILATION_TEST',
+    '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)',
+  ],
+  dependencies: [
+    shared_nm_glib_aux_dep,
+    libnm_systemd_shared_no_logging_dep,
+    shared_c_siphash_dep,
+  ],
+)
+
+test(
+  'shared/nm-utils/' + test_unit,
+  test_script,
+  args: test_args + [exe.full_path()],
+  timeout: default_test_timeout,
+)
diff --git a/src/meson.build b/src/meson.build
index f3f5ee581a..a9e7601de6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -293,10 +293,9 @@ network_manager_sym = executable(
 # this uses symbols from nm-full-symbols instead of libNetworkManager.a
 ver_script = custom_target(
   symbol_map_name,
-  input: meson.source_root(),
   output: symbol_map_name,
   depends: [ network_manager_sym, core_plugins ],
-  command: [create_exports_networkmanager, '--called-from-build', '@INPUT@'],
+  command: [create_exports_networkmanager, '--called-from-build', meson.source_root()],
 )
 
 ldflags = ['-rdynamic', '-Wl,--version-script,@0@'.format(ver_script.full_path())]