summaryrefslogtreecommitdiff
path: root/clients
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-01-11 12:34:40 +0100
committerThomas Haller <thaller@redhat.com>2018-01-11 12:46:01 +0100
commit34cb6f9877a9b7a7032899dbccca1def88da4191 (patch)
treee36cd40bbde4ae06d9f4225d3fb7b3ec7f115c20 /clients
parent98b46537fa1a91941b5f7a8252b3fce85554a855 (diff)
build/meson: use variables for ldflags and linker-script
Diffstat (limited to 'clients')
-rw-r--r--clients/cli/meson.build6
-rw-r--r--clients/meson.build6
-rw-r--r--clients/tui/meson.build6
3 files changed, 3 insertions, 15 deletions
diff --git a/clients/cli/meson.build b/clients/cli/meson.build
index adfe0e94a9..65317a0ac9 100644
--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@@ -31,10 +31,6 @@ cflags = clients_cflags + [
'-DNMCLI_LOCALEDIR="@0@"'.format(nm_localedir)
]
-ldflags = [
- '-Wl,--version-script,@0@'.format(linker_script_binary),
-]
-
if enable_polkit_agent
sources += nm_polkit_listener
@@ -46,7 +42,7 @@ executable(
sources,
dependencies: deps,
c_args: cflags,
- link_args: ldflags,
+ link_args: ldflags_linker_script_binary,
link_depends: linker_script_binary,
install: true
)
diff --git a/clients/meson.build b/clients/meson.build
index efcaf299fb..46e1f1cd74 100644
--- a/clients/meson.build
+++ b/clients/meson.build
@@ -14,16 +14,12 @@ cflags = clients_cflags + [
'-DG_LOG_DOMAIN="@0@"'.format(name),
]
-ldflags = [
- '-Wl,--version-script,@0@'.format(linker_script_binary),
-]
-
executable(
name,
name + '.c',
dependencies: deps,
c_args: cflags,
- link_args: ldflags,
+ link_args: ldflags_linker_script_binary,
link_depends: linker_script_binary,
install: true
)
diff --git a/clients/tui/meson.build b/clients/tui/meson.build
index d2bf27c687..dd472998da 100644
--- a/clients/tui/meson.build
+++ b/clients/tui/meson.build
@@ -61,16 +61,12 @@ deps += [
libnmt_newt_dep
]
-ldflags = [
- '-Wl,--version-script,@0@'.format(linker_script_binary),
-]
-
executable(
name,
sources,
dependencies: deps,
c_args: cflags,
- link_args: ldflags,
+ link_args: ldflags_linker_script_binary,
link_depends: linker_script_binary,
install: true
)