build: Clean up tools' dependencies
Simply reusing the same dependencies as gnome-shell itself not only means that we link tons of stuff unnecessarily, but also that we have to do the whole mutter rpath dance for nothing. Just use the dependencies those executables actually need for a nice cleanup. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/192
This commit is contained in:
parent
dc4128c78b
commit
9cf571efbd
@ -59,6 +59,9 @@ gnome_shell_deps = [
|
|||||||
gnome_shell_deps += nm_deps
|
gnome_shell_deps += nm_deps
|
||||||
gnome_shell_deps += recorder_deps
|
gnome_shell_deps += recorder_deps
|
||||||
|
|
||||||
|
tools_cflags = '-DLOCALEDIR="@0@"'.format(localedir)
|
||||||
|
tools_deps = [gio_dep, gjs_dep]
|
||||||
|
|
||||||
libshell_menu_gir_sources = [
|
libshell_menu_gir_sources = [
|
||||||
'gtkactionmuxer.h',
|
'gtkactionmuxer.h',
|
||||||
'gtkactionmuxer.c',
|
'gtkactionmuxer.c',
|
||||||
@ -259,11 +262,9 @@ executable('gnome-shell', 'main.c',
|
|||||||
|
|
||||||
executable('gnome-shell-extension-prefs',
|
executable('gnome-shell-extension-prefs',
|
||||||
'gnome-shell-extension-prefs.c', js_resources,
|
'gnome-shell-extension-prefs.c', js_resources,
|
||||||
c_args: gnome_shell_cflags,
|
c_args: tools_cflags,
|
||||||
dependencies: gnome_shell_deps,
|
dependencies: tools_deps,
|
||||||
include_directories: [conf_inc],
|
include_directories: [conf_inc],
|
||||||
build_rpath: mutter_typelibdir,
|
|
||||||
install_rpath: install_rpath,
|
|
||||||
install: true
|
install: true
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -271,11 +272,9 @@ executable('gnome-shell-extension-prefs',
|
|||||||
if have_networkmanager
|
if have_networkmanager
|
||||||
executable('gnome-shell-portal-helper',
|
executable('gnome-shell-portal-helper',
|
||||||
'gnome-shell-portal-helper.c', js_resources,
|
'gnome-shell-portal-helper.c', js_resources,
|
||||||
c_args: gnome_shell_cflags,
|
c_args: tools_cflags,
|
||||||
dependencies: gnome_shell_deps,
|
dependencies: tools_deps,
|
||||||
include_directories: [conf_inc],
|
include_directories: [conf_inc],
|
||||||
build_rpath: mutter_typelibdir,
|
|
||||||
install_rpath: install_rpath,
|
|
||||||
install_dir: libexecdir,
|
install_dir: libexecdir,
|
||||||
install: true
|
install: true
|
||||||
)
|
)
|
||||||
@ -284,8 +283,6 @@ endif
|
|||||||
executable('gnome-shell-perf-helper', 'shell-perf-helper.c',
|
executable('gnome-shell-perf-helper', 'shell-perf-helper.c',
|
||||||
dependencies: [gtk_dep, gio_dep, m_dep],
|
dependencies: [gtk_dep, gio_dep, m_dep],
|
||||||
include_directories: [conf_inc],
|
include_directories: [conf_inc],
|
||||||
build_rpath: mutter_typelibdir,
|
|
||||||
install_rpath: install_rpath,
|
|
||||||
install_dir: libexecdir,
|
install_dir: libexecdir,
|
||||||
install: true
|
install: true
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user