[gnome-software: 4/13] build: Use libgnomesoftware_dep rather than link_with: libgnomesoftware
- From: Phaedrus Leeds <mwleeds src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software: 4/13] build: Use libgnomesoftware_dep rather than link_with: libgnomesoftware
- Date: Thu, 28 Jan 2021 19:27:36 +0000 (UTC)
commit 8575cd7a060673cd3f9d6a389933fdd4e0d340f6
Author: Philip Withnall <pwithnall endlessos org>
Date: Tue Jan 26 16:40:36 2021 +0000
build: Use libgnomesoftware_dep rather than link_with: libgnomesoftware
This achieves the same end, but also ensures built sources in
libgnomesoftware (like enum headers) are built first. It’s also shorter.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
lib/meson.build | 8 ++----
plugins/core/meson.build | 42 ----------------------------
plugins/dpkg/meson.build | 6 ----
plugins/dummy/meson.build | 6 ----
plugins/eos-updater/meson.build | 3 --
plugins/external-appstream/meson.build | 3 --
plugins/fedora-langpacks/meson.build | 6 ----
plugins/fedora-pkgdb-collections/meson.build | 3 --
plugins/flatpak/meson.build | 6 ----
plugins/fwupd/meson.build | 6 ----
plugins/malcontent/meson.build | 5 +---
plugins/meson.build | 3 +-
plugins/modalias/meson.build | 6 ----
plugins/odrs/meson.build | 3 --
plugins/packagekit/meson.build | 36 ------------------------
plugins/repos/meson.build | 6 ----
plugins/rpm-ostree/meson.build | 3 --
plugins/snap/meson.build | 6 ----
src/meson.build | 8 ++----
19 files changed, 7 insertions(+), 158 deletions(-)
---
diff --git a/lib/meson.build b/lib/meson.build
index dcf24389..e71583a3 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -105,13 +105,11 @@ executable(
goa,
gtk,
json_glib,
+ libgnomesoftware_dep,
libm,
libsoup,
valgrind,
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
install : true,
install_dir : get_option('libexecdir')
@@ -136,12 +134,10 @@ if get_option('tests')
goa,
gtk,
json_glib,
+ libgnomesoftware_dep,
libm,
libsoup
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs
)
test('gs-self-test-lib', e, suite: ['lib'], env: test_env, timeout : 120)
diff --git a/plugins/core/meson.build b/plugins/core/meson.build
index 10c43f32..4cc42ada 100644
--- a/plugins/core/meson.build
+++ b/plugins/core/meson.build
@@ -11,9 +11,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -27,9 +24,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -43,9 +37,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -59,9 +50,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -75,9 +63,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
@@ -92,9 +77,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -114,9 +96,6 @@ shared_module(
plugin_libs,
libxmlb,
],
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -133,9 +112,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -152,9 +128,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -168,9 +141,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
if get_option('hardcoded_popular')
@@ -185,9 +155,6 @@ if get_option('hardcoded_popular')
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
endif
@@ -202,9 +169,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -218,9 +182,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
if get_option('tests')
@@ -241,9 +202,6 @@ if get_option('tests')
plugin_libs,
libxmlb,
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
)
test('gs-self-test-core', e, suite: ['plugins', 'core'], env: test_env)
diff --git a/plugins/dpkg/meson.build b/plugins/dpkg/meson.build
index ffae6369..594d6e46 100644
--- a/plugins/dpkg/meson.build
+++ b/plugins/dpkg/meson.build
@@ -11,9 +11,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
if get_option('tests')
@@ -32,9 +29,6 @@ if get_option('tests')
dependencies : [
plugin_libs,
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
)
test('gs-self-test-dpkg', e, suite: ['plugins', 'dpkg'], env: test_env)
diff --git a/plugins/dummy/meson.build b/plugins/dummy/meson.build
index 9d23792d..5b098db6 100644
--- a/plugins/dummy/meson.build
+++ b/plugins/dummy/meson.build
@@ -13,9 +13,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : [plugin_libs],
- link_with : [
- libgnomesoftware
- ]
)
if get_option('tests')
@@ -32,9 +29,6 @@ if get_option('tests')
dependencies : [
plugin_libs,
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
)
test('gs-self-test-dummy', e, suite: ['plugins', 'dummy'], env: test_env)
diff --git a/plugins/eos-updater/meson.build b/plugins/eos-updater/meson.build
index 2a22e88c..19edf226 100644
--- a/plugins/eos-updater/meson.build
+++ b/plugins/eos-updater/meson.build
@@ -22,7 +22,4 @@ shared_module(
plugin_libs,
ostree,
],
- link_with : [
- libgnomesoftware,
- ],
)
diff --git a/plugins/external-appstream/meson.build b/plugins/external-appstream/meson.build
index 2252c7d5..95831c5c 100644
--- a/plugins/external-appstream/meson.build
+++ b/plugins/external-appstream/meson.build
@@ -32,7 +32,4 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : [gio_unix, appstream_glib, libsoup, plugin_libs],
- link_with : [
- libgnomesoftware
- ]
)
diff --git a/plugins/fedora-langpacks/meson.build b/plugins/fedora-langpacks/meson.build
index cdc3757b..c3dc0576 100644
--- a/plugins/fedora-langpacks/meson.build
+++ b/plugins/fedora-langpacks/meson.build
@@ -11,9 +11,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
if get_option('tests')
@@ -31,9 +28,6 @@ if get_option('tests')
dependencies : [
plugin_libs,
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
)
test('gs-self-test-fedora-langpacks', e, suite: ['plugins', 'fedora-langpacks'], env: test_env)
diff --git a/plugins/fedora-pkgdb-collections/meson.build b/plugins/fedora-pkgdb-collections/meson.build
index ae093ba5..9058572a 100644
--- a/plugins/fedora-pkgdb-collections/meson.build
+++ b/plugins/fedora-pkgdb-collections/meson.build
@@ -11,7 +11,4 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
diff --git a/plugins/flatpak/meson.build b/plugins/flatpak/meson.build
index 0afc5a97..fc95f01a 100644
--- a/plugins/flatpak/meson.build
+++ b/plugins/flatpak/meson.build
@@ -28,9 +28,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : deps,
- link_with : [
- libgnomesoftware
- ]
)
metainfo = 'org.gnome.Software.Plugin.Flatpak.metainfo.xml'
@@ -61,9 +58,6 @@ if get_option('tests')
include_directories('../../lib'),
],
dependencies : deps,
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
)
test('gs-self-test-flatpak', e, suite: ['plugins', 'flatpak'], env: test_env, timeout : 120)
diff --git a/plugins/fwupd/meson.build b/plugins/fwupd/meson.build
index 7c89add3..32a7adc8 100644
--- a/plugins/fwupd/meson.build
+++ b/plugins/fwupd/meson.build
@@ -23,9 +23,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : deps,
- link_with : [
- libgnomesoftware
- ]
)
metainfo = 'org.gnome.Software.Plugin.Fwupd.metainfo.xml'
@@ -51,9 +48,6 @@ if get_option('tests')
include_directories('../../lib'),
],
dependencies : deps,
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
)
test('gs-self-test-fwupd', e, suite: ['plugins', 'fwupd'], env: test_env)
diff --git a/plugins/malcontent/meson.build b/plugins/malcontent/meson.build
index ea0740ad..149fde60 100644
--- a/plugins/malcontent/meson.build
+++ b/plugins/malcontent/meson.build
@@ -11,7 +11,4 @@ shared_module(
install_dir: plugin_dir,
c_args : c_args,
dependencies : [ plugin_libs, malcontent ],
- link_with : [
- libgnomesoftware,
- ],
-)
\ No newline at end of file
+)
diff --git a/plugins/meson.build b/plugins/meson.build
index d749b3df..44f6a24b 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -5,7 +5,8 @@ plugin_libs = [
goa,
gtk,
json_glib,
- libsoup
+ libsoup,
+ libgnomesoftware_dep,
]
subdir('core')
diff --git a/plugins/modalias/meson.build b/plugins/modalias/meson.build
index 22cac6d2..fc0c806c 100644
--- a/plugins/modalias/meson.build
+++ b/plugins/modalias/meson.build
@@ -14,9 +14,6 @@ sources : 'gs-plugin-modalias.c',
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, gudev ],
- link_with : [
- libgnomesoftware
- ]
)
if get_option('tests')
@@ -33,9 +30,6 @@ if get_option('tests')
dependencies : [
plugin_libs,
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
)
test('gs-self-test-modalias', e, suite: ['plugins', 'modalias'], env: test_env)
diff --git a/plugins/odrs/meson.build b/plugins/odrs/meson.build
index 254530d3..df51d752 100644
--- a/plugins/odrs/meson.build
+++ b/plugins/odrs/meson.build
@@ -11,9 +11,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
metainfo = 'org.gnome.Software.Plugin.Odrs.metainfo.xml'
diff --git a/plugins/packagekit/meson.build b/plugins/packagekit/meson.build
index 05ae4d4d..74aefaec 100644
--- a/plugins/packagekit/meson.build
+++ b/plugins/packagekit/meson.build
@@ -24,9 +24,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : deps,
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -44,9 +41,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : deps,
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -65,9 +59,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, packagekit ],
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -85,9 +76,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, packagekit ],
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -105,9 +93,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, packagekit ],
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -125,9 +110,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, packagekit ],
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -144,9 +126,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, packagekit ],
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -164,9 +143,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, packagekit ],
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -183,9 +159,6 @@ sources : [
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, packagekit ],
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -199,9 +172,6 @@ sources : 'gs-plugin-packagekit-proxy.c',
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, packagekit ],
- link_with : [
- libgnomesoftware
- ]
)
shared_module(
@@ -219,9 +189,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, packagekit ],
- link_with : [
- libgnomesoftware
- ]
)
if get_option('tests')
@@ -240,9 +207,6 @@ if get_option('tests')
dependencies : [
plugin_libs,
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
)
test('gs-self-test-packagekit', e, suite: ['plugins', 'packagekit'], env: test_env)
diff --git a/plugins/repos/meson.build b/plugins/repos/meson.build
index 201b137b..81172d24 100644
--- a/plugins/repos/meson.build
+++ b/plugins/repos/meson.build
@@ -12,9 +12,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : plugin_libs,
- link_with : [
- libgnomesoftware
- ]
)
if get_option('tests')
@@ -32,9 +29,6 @@ if get_option('tests')
dependencies : [
plugin_libs,
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
)
test('gs-self-test-repos', e, suite: ['plugins', 'repos'], env: test_env)
diff --git a/plugins/rpm-ostree/meson.build b/plugins/rpm-ostree/meson.build
index 840f9e7e..5244cdd6 100644
--- a/plugins/rpm-ostree/meson.build
+++ b/plugins/rpm-ostree/meson.build
@@ -20,7 +20,4 @@ shared_module(
install_rpath: join_paths(rpm_ostree.get_pkgconfig_variable('libdir'), 'rpm-ostree'),
c_args : cargs,
dependencies : [ plugin_libs, libdnf, ostree, rpm, rpm_ostree ],
- link_with : [
- libgnomesoftware
- ]
)
diff --git a/plugins/snap/meson.build b/plugins/snap/meson.build
index 6afe62cd..2bd8d25c 100644
--- a/plugins/snap/meson.build
+++ b/plugins/snap/meson.build
@@ -13,9 +13,6 @@ shared_module(
install_dir: plugin_dir,
c_args : cargs,
dependencies : [ plugin_libs, snap ],
- link_with : [
- libgnomesoftware
- ]
)
metainfo = 'org.gnome.Software.Plugin.Snap.metainfo.xml'
@@ -45,9 +42,6 @@ if get_option('tests')
plugin_libs,
snap
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
)
test('gs-self-test-snap', e, suite: ['plugins', 'snap'], env: test_env)
diff --git a/src/meson.build b/src/meson.build
index 9a43033e..71e1e092 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -79,6 +79,7 @@ gnome_software_dependencies = [
goa,
gtk,
json_glib,
+ libgnomesoftware_dep,
libm,
libsoup,
libxmlb,
@@ -126,9 +127,6 @@ executable(
include_directories('../lib'),
],
dependencies : gnome_software_dependencies,
- link_with : [
- libgnomesoftware
- ],
c_args : cargs,
install : true,
install_dir : get_option('bindir')
@@ -247,12 +245,10 @@ if get_option('tests')
goa,
gtk,
json_glib,
+ libgnomesoftware_dep,
libm,
libsoup,
],
- link_with : [
- libgnomesoftware
- ],
c_args : cargs
)
test('gs-self-test-src', e, suite: ['plugins', 'src'], env: test_env)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
