build/meson: cleanup "libnm/meson.build"

libnm/meson.build

@@ -8,11 +8,6 @@ libnm_nm_default_dep = declare_dependency(
   dependencies: libnm_core_nm_default_dep,
 )
 
-c_flags = [
-  '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
-  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
-]
-
 libnm_headers = files(
   'NetworkManager.h',
   'nm-access-point.h',
@@ -70,14 +65,12 @@ install_headers(
   subdir: libnm_name,
 )
 
-enum_types = 'nm-enum-types'
-
 libnm_enum_sources = gnome.mkenums(
-  enum_types,
+  'nm-enum-types',
   sources: libnm_headers + [nm_version_macro_header],
   identifier_prefix: nm_id_prefix,
-  c_template: enum_types + '.c.template',
-  h_template: enum_types + '.h.template',
+  c_template: 'nm-enum-types.c.template',
+  h_template: 'nm-enum-types.h.template',
   install_header: true,
   install_dir: libnm_pkgincludedir,
 )
@@ -137,39 +130,38 @@ libnm_sources = files(
   'nm-wimax-nsp.c',
 )
 
-deps = [
-  libnmdbus_dep,
-  libnm_libnm_core_intern_dep,
-  libnm_nm_default_dep,
-  libnm_keyfile_dep,
-  libnm_udev_aux_dep,
-  libudev_dep,
-]
-
 liblibnm = static_library(
   'libnm',
   sources: libnm_sources + libnm_enum_sources,
-  dependencies: deps,
-  c_args: c_flags,
+  dependencies: [
+    libnmdbus_dep,
+    libnm_libnm_core_intern_dep,
+    libnm_nm_default_dep,
+    libnm_keyfile_dep,
+    libnm_udev_aux_dep,
+    libudev_dep,
+  ],
+  c_args: [
+    '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
+    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
+  ],
   link_with: libnm_systemd_logging_stub,
 )
 
-links = [
-  liblibnm,
-  libnm_core,
-  libnm_keyfile,
-  libnmdbus,
-  libnm_systemd_logging_stub,
-  libnm_glib_aux,
-]
-
 linker_script = join_paths(meson.current_source_dir(), 'libnm.ver')
 
 libnm = shared_library(
   'nm',
   version: libnm_version,
   dependencies: libnm_nm_default_dep,
-  link_whole: links,
+  link_whole: [
+    liblibnm,
+    libnm_core,
+    libnm_keyfile,
+    libnmdbus,
+    libnm_systemd_logging_stub,
+    libnm_glib_aux,
+  ],
   link_args: '-Wl,--version-script,@0@'.format(linker_script),
   link_depends: linker_script,
   install: true,
@@ -213,7 +205,10 @@ if enable_introspection
     symbol_prefix: nm_id_prefix.to_lower(),
     header: 'NetworkManager.h',
     export_packages: libnm_name,
-    extra_args: c_flags,
+    extra_args: [
+      '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
+      '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
+    ],
     install: true,
   )
 
@@ -299,10 +294,6 @@ if enable_introspection
 
 endif
 
-if enable_tests
-  subdir('tests')
-endif
-
 libnm_libnm_aux = static_library(
   'nm-libnm-aux',
   sources: files(
@@ -323,3 +314,7 @@ libnm_libnm_aux_dep = declare_dependency(
   include_directories: [shared_inc],
   link_with: [libnm_libnm_aux],
 )
+
+if enable_tests
+  subdir('tests')
+endif