X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgbm%2Fmeson.build;h=39fa0386a657ae52c6edbd1fc697dc3dcfcf9c4f;hb=aa6973e6110541d0a6642072f763f550341ed9b3;hp=f25f3172027794f1cc4f157092f32ba9d3f8d463;hpb=5be1b1a8ce6c635cf0310d2b97056a2b8f11a601;p=mesa.git

diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index f25f3172027..39fa0386a65 100644
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_gbm = include_directories('.', 'backends/dri')
+inc_gbm = include_directories('.', 'main', 'backends/dri')
 
 files_gbm = files(
   'main/backend.c',
@@ -29,34 +29,28 @@ files_gbm = files(
 )
 deps_gbm = []
 args_gbm = []
-links_gbm = []
 deps_gbm = []
 incs_gbm = [
   include_directories('main'), inc_include, inc_src, inc_loader,
-  inc_wayland_drm,
 ]
 
 if with_dri2
   files_gbm += files('backends/dri/gbm_dri.c', 'backends/dri/gbm_driint.h')
   deps_gbm += dep_libdrm # TODO: pthread-stubs
-  args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir)
 endif
 if with_platform_wayland
   deps_gbm += dep_wayland_server
-  links_gbm += libwayland_drm
   incs_gbm += inc_wayland_drm
 endif
 
-# TODO: wayland support (requires egl)
-
 libgbm = shared_library(
   'gbm',
   files_gbm,
   include_directories : incs_gbm,
   c_args : [c_vis_args, args_gbm],
   link_args : [ld_args_gc_sections],
-  link_with : [links_gbm, libloader, libmesa_util, libxmlconfig],
-  dependencies : [deps_gbm, dep_dl],
+  link_with : [libloader, libmesa_util, libxmlconfig],
+  dependencies : [deps_gbm, dep_dl, dep_thread],
   version : '1.0.0',
   install : true,
 )
@@ -72,9 +66,15 @@ pkg.generate(
   libraries_private : '-ldl',  # FIXME: autotools lists this a incomplete
 )
 
-if with_tests
-  test('gbm-symbols-check',
-    find_program('gbm-symbols-check'),
-    args : libgbm
+if with_tests and prog_nm.found()
+  test(
+    'gbm-symbols-check',
+    symbols_check,
+    args : [
+      '--lib', libgbm,
+      '--symbols-file', files('gbm-symbols.txt'),
+      '--nm', prog_nm.path(),
+    ],
+    suite : ['gbm'],
   )
 endif