frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: use link_with for Xorg's shared modules as well as Xorg. 

I converted Xorg when meson 0.40 came out, but fumbled my grep and
forgot that I had instances of the .extract_all_objects() workaround
in dixmods, too.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Eric Anholt 2017-04-28 15:09:37 -07:00 committed by Adam Jackson
parent e2f68296ff
commit 62f727c7ea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/dixmods/meson.build
View File

@ -18,7 +18,7 @@ shared_module(
include_directories: [inc, xorg_inc], include_directories: [inc, xorg_inc],
c_args: xorg_c_args, c_args: xorg_c_args,
dependencies: common_dep, dependencies: common_dep,
objects: libxserver_fb.extract_all_objects(), link_with: libxserver_fb,
install: true, install: true,
install_dir: module_dir, install_dir: module_dir,
@ -31,7 +31,7 @@ shared_module(
include_directories: [inc, xorg_inc], include_directories: [inc, xorg_inc],
c_args: [ xorg_c_args, wfb_args ], c_args: [ xorg_c_args, wfb_args ],
dependencies: common_dep, dependencies: common_dep,
objects: libxserver_wfb.extract_all_objects(), link_with: libxserver_wfb,
install: true, install: true,
install_dir: module_dir, install_dir: module_dir,
@ -43,7 +43,7 @@ shared_module(
include_directories: [inc, xorg_inc], include_directories: [inc, xorg_inc],
c_args: xorg_c_args, c_args: xorg_c_args,
dependencies: common_dep, dependencies: common_dep,
objects: libxserver_miext_shadow.extract_all_objects(), link_with: libxserver_miext_shadow,
install: true, install: true,
install_dir: module_dir, install_dir: module_dir,
@ -57,7 +57,7 @@ if build_glx
include_directories: [ inc, xorg_inc, glx_inc ], include_directories: [ inc, xorg_inc, glx_inc ],
c_args: [ xorg_c_args, glx_align64 ], c_args: [ xorg_c_args, glx_align64 ],
dependencies: [ common_dep, dl_dep ], dependencies: [ common_dep, dl_dep ],
objects: libxserver_glx.extract_all_objects(), link_with: libxserver_glx,
install: true, install: true,
install_dir: join_paths(module_dir, 'extensions') install_dir: join_paths(module_dir, 'extensions')