[PATCH xserver 1/2] meson: use link_with for Xorg's shared modules as well as Xorg.

Eric Anholt eric at anholt.net
Fri Apr 28 22:09:37 UTC 2017


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 at anholt.net>
---
 hw/xfree86/dixmods/meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index 36027f045991..39276dc32839 100644
--- a/hw/xfree86/dixmods/meson.build
+++ b/hw/xfree86/dixmods/meson.build
@@ -18,7 +18,7 @@ shared_module(
     include_directories: [inc, xorg_inc],
     c_args: xorg_c_args,
     dependencies: common_dep,
-    objects: libxserver_fb.extract_all_objects(),
+    link_with: libxserver_fb,
 
     install: true,
     install_dir: module_dir,
@@ -31,7 +31,7 @@ shared_module(
     include_directories: [inc, xorg_inc],
     c_args: [ xorg_c_args, wfb_args ],
     dependencies: common_dep,
-    objects: libxserver_wfb.extract_all_objects(),
+    link_with: libxserver_wfb,
 
     install: true,
     install_dir: module_dir,
@@ -43,7 +43,7 @@ shared_module(
     include_directories: [inc, xorg_inc],
     c_args: xorg_c_args,
     dependencies: common_dep,
-    objects: libxserver_miext_shadow.extract_all_objects(),
+    link_with: libxserver_miext_shadow,
 
     install: true,
     install_dir: module_dir,
@@ -57,7 +57,7 @@ if build_glx
         include_directories: [ inc, xorg_inc, glx_inc ],
         c_args: [ xorg_c_args, glx_align64 ],
         dependencies: [ common_dep, dl_dep ],
-        objects: libxserver_glx.extract_all_objects(),
+        link_with: libxserver_glx,
 
         install: true,
         install_dir: join_paths(module_dir, 'extensions')
-- 
2.11.0



More information about the xorg-devel mailing list