fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-07 06:28:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: give the xorg executable an actual name

Browse source 
Matches e.g. xvfb_server and xwayland_server.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2187>
This commit is contained in:
Peter Hutterer 2026-04-27 10:29:40 +10:00 • committed by Marge Bot
parent f70cc16c68
commit 2e4a5aecef
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/xfree86/dixmods/meson.build
View file

@ -6,7 +6,7 @@ shared_module(
c_args: [ xorg_c_args, wfb_args ],
dependencies: common_dep,
link_whole: libxserver_wfb,
link_with: e,
link_with: xorg_server,
install: true,
install_dir: module_dir,
@ -20,7 +20,7 @@ shared_module(
c_args: xorg_c_args,
dependencies: common_dep,
link_whole: libxserver_miext_shadow,
link_with: e,
link_with: xorg_server,
install: true,
install_dir: module_dir,
@ -35,7 +35,7 @@ if build_glx
c_args: [ xorg_c_args, glx_align64 ],
dependencies: [ common_dep, dl_dep, dri_dep ],
link_whole: libxserver_glx,
link_with: e,
link_with: xorg_server,
install: true,
install_dir: module_dir / 'extensions'

2
hw/xfree86/drivers/inputtest/meson.build
View file

@ -14,7 +14,7 @@ shared_module(
install: true,
install_dir: module_dir / 'input',
link_with: e,
link_with: xorg_server,
)
install_man(configure_file(

2
hw/xfree86/exa/meson.build
View file

@ -2,7 +2,7 @@ xorg_exa = shared_module('exa',
'examodule.c',
include_directories: [inc, xorg_inc],
dependencies: common_dep,
link_with: [libxserver_exa, e],
link_with: [libxserver_exa, xorg_server],
c_args: xorg_c_args,
install: true,
install_dir: module_dir,

2
hw/xfree86/fbdevhw/meson.build
View file

@ -11,7 +11,7 @@ shared_module('fbdevhw',
c_args: xorg_c_args,
install: true,
install_dir: module_dir,
link_with: e,
link_with: xorg_server,
)
install_data('fbdevhw.h', install_dir: xorgsdkdir)

2
hw/xfree86/meson.build
View file

@ -101,7 +101,7 @@ else
xorg_install_dir = get_option('bindir')
endif
e = executable(
xorg_server = executable(
'Xorg',
srcs_xorg,
include_directories: [inc, xorg_inc],

2
hw/xfree86/shadowfb/meson.build
View file

@ -5,7 +5,7 @@ shared_module('shadowfb',
c_args: xorg_c_args,
install: true,
install_dir: module_dir,
link_with: e,
link_with: xorg_server,
)
install_data('shadowfb.h', install_dir: xorgsdkdir)