diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2019-09-11 08:04:39 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-10-01 09:49:33 +0200 |
| commit | dababfa59ea68d780576d860c3ba1d2b43645465 (patch) | |
| tree | 7859dd3c0d076da4f7f9c94b905e0fa5f412804d | |
| parent | 23bd02110cbb99d102c2478a9ba8085d8ee6a9fb (diff) | |
| download | NetworkManager-dababfa59ea68d780576d860c3ba1d2b43645465.tar.gz | |
meson: Improve ppp build file
The set of c_flags used when building `ppp` targets has been grouped
together. Used dependencies have also been reviewed and removed
the unnecessary one.
| -rw-r--r-- | src/ppp/meson.build | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/ppp/meson.build b/src/ppp/meson.build index 3cfbd6018b..0c458768f3 100644 --- a/src/ppp/meson.build +++ b/src/ppp/meson.build @@ -1,20 +1,16 @@ name = 'nm-pppd-plugin' -deps = [ - dl_dep, - libnm_core_nm_default_dep, +c_flags = [ + '-DG_LOG_DOMAIN="@0@"'.format(name), + '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB', ] nm_pppd_plugin = shared_module( name, name_prefix: '', sources: name + '.c', - include_directories: src_inc, - dependencies: deps, - c_args: [ - '-DG_LOG_DOMAIN="@0@"'.format(name), - '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB', - ], + dependencies: libnm_core_nm_default_dep, + c_args: c_flags, install: true, install_dir: pppd_plugin_dir, ) @@ -28,9 +24,7 @@ core_plugins += shared_module( sources: 'nm-ppp-manager.c', dependencies: daemon_nm_default_dep, c_args: daemon_c_flags, - link_args: [ - '-Wl,--version-script,@0@'.format(linker_script), - ], + link_args: '-Wl,--version-script,@0@'.format(linker_script), link_depends: linker_script, install: true, install_dir: nm_plugindir, |