gbm: remove unnecessary meson include

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

diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index f9665aa2d2f5abd5558d03632c972f396699ff28..719f9c1a9b8a59bbbe414d9ad82e107d49ab0c82 100644 (file)
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+inc_gbm = include_directories('.', 'main', 'backends/dri')
+
 files_gbm = files(
   'main/backend.c',
   'main/backend.h',
@@ -27,26 +29,30 @@ 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, dep_thread]
-  args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir)
+  deps_gbm += dep_libdrm # TODO: pthread-stubs
+  args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path)
+endif
+if with_platform_wayland
+  deps_gbm += dep_wayland_server
+  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],
-  c_args : args_gbm,
+  include_directories : incs_gbm,
+  c_args : [c_vis_args, args_gbm],
   link_args : [ld_args_gc_sections],
   link_with : [libloader, libmesa_util, libxmlconfig],
-  dependencies : [deps_gbm, dep_dl],
-  version : '1.0',
+  dependencies : [deps_gbm, dep_dl, dep_thread],
+  version : '1.0.0',
   install : true,
 )
 
@@ -62,6 +68,10 @@ pkg.generate(
 )
 
 if with_tests
-  gbm_symbols_check = find_program('gbm-symbols-check')
-  test('gbm-symbols-check', gbm_symbols_check)
+  test(
+    'gbm-symbols-check',
+    find_program('gbm-symbols-check'),
+    env : env_test,
+    args : libgbm
+  )
 endif