gbm: replace NULL sentinel with explicit ARRAY_SIZE()

[mesa.git] / src / gbm / meson.build

diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index fc1816cc17abe431090aefc87e2f0969daef4931..311bcc74efc2affcd11ed2e2d1703ff1343dc50f 100644 (file)
--- 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,32 +29,29 @@ files_gbm = files(
 )
 deps_gbm = []
 args_gbm = []
-links_gbm = []
 deps_gbm = []
+incs_gbm = [
+  include_directories('main'), inc_include, inc_src, inc_loader,
+]
 
 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 : [
-    include_directories('main'), inc_include, inc_src, inc_loader,
-    include_directories('../egl/wayland/wayland-drm')],
-  c_args : args_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],
-  version : '1.0',
+  link_with : libloader,
+  dependencies : [deps_gbm, dep_dl, dep_thread, idep_mesautil, idep_xmlconfig],
+  version : '1.0.0',
   install : true,
 )
 
@@ -69,7 +66,15 @@ pkg.generate(
   libraries_private : '-ldl',  # FIXME: autotools lists this a incomplete
 )
 
-if with_tests
-  gbm_symbols_check = find_program('gbm-symbols-check')
-  test('gbm-symbols-check', gbm_symbols_check)
+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