Use consistent names for internal meson dependencies

13 files changed, 28 insertions, 28 deletions

diff --git a/examples/meson.build b/examples/meson.build
index 2b4e5f1..b1ac7a6 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -113,7 +113,7 @@ else
   foreach example : stub_examples
     source = [example]
     target = example.split('.')[0]
-    dependencies = [pugl_dep, stub_backend_dep]
+    dependencies = [pugl_dep, pugl_stub_dep]
     defines = []
 
     executable(
@@ -131,7 +131,7 @@ else
     foreach example : gl_examples
       source = [example]
       target = example.split('.')[0]
-      dependencies = [pugl_dep, gl_backend_dep]
+      dependencies = [pugl_dep, pugl_gl_dep]
       defines = []
 
       if target == 'pugl_shader_demo'
@@ -139,7 +139,7 @@ else
         dependencies += [dl_dep]
         defines += ['-D_POSIX_C_SOURCE=200809L']
       elif target == 'pugl_print_events'
-        dependencies += [stub_backend_dep]
+        dependencies += [pugl_stub_dep]
       elif target == 'pugl_cpp_demo'
         dependencies += [puglpp_dep]
       endif
@@ -163,7 +163,7 @@ else
         target,
         example,
         c_args: example_defines + example_c_args + cairo_args,
-        dependencies: [pugl_dep, cairo_backend_dep],
+        dependencies: [pugl_dep, pugl_cairo_dep],
         include_directories: includes,
       )
     endforeach
@@ -174,7 +174,7 @@ else
     foreach example : vulkan_examples
       source = [example]
       target = example.split('.')[0]
-      dependencies = [dl_dep, vulkan_backend_dep]
+      dependencies = [dl_dep, pugl_vulkan_dep]
       defines = []
 
       if target == 'pugl_vulkan_cpp_demo'
diff --git a/examples/pugl_cairo_demo.app/MacOS/meson.build b/examples/pugl_cairo_demo.app/MacOS/meson.build
index 21277a5..18e1fcf 100644
--- a/examples/pugl_cairo_demo.app/MacOS/meson.build
+++ b/examples/pugl_cairo_demo.app/MacOS/meson.build
@@ -6,6 +6,6 @@ executable(
   ['../../pugl_cairo_demo.c'],
   c_args: example_defines + example_c_args + cairo_args,
   cpp_args: example_defines + example_cpp_args,
-  dependencies: [pugl_dep, cairo_backend_dep],
+  dependencies: [pugl_dep, pugl_cairo_dep],
   include_directories: include_directories('../../..'),
 )
diff --git a/examples/pugl_clipboard_demo.app/MacOS/meson.build b/examples/pugl_clipboard_demo.app/MacOS/meson.build
index f27ce56..31ad2f0 100644
--- a/examples/pugl_clipboard_demo.app/MacOS/meson.build
+++ b/examples/pugl_clipboard_demo.app/MacOS/meson.build
@@ -5,6 +5,6 @@ executable(
   'pugl_clipboard_demo',
   '../../pugl_clipboard_demo.c',
   c_args: example_defines + example_c_args,
-  dependencies: [pugl_dep, gl_backend_dep],
+  dependencies: [pugl_dep, pugl_gl_dep],
   include_directories: include_directories('../../..'),
 )
diff --git a/examples/pugl_cpp_demo.app/MacOS/meson.build b/examples/pugl_cpp_demo.app/MacOS/meson.build
index 9b5393b..f5ddd67 100644
--- a/examples/pugl_cpp_demo.app/MacOS/meson.build
+++ b/examples/pugl_cpp_demo.app/MacOS/meson.build
@@ -6,6 +6,6 @@ executable(
   '../../pugl_cpp_demo.cpp',
   c_args: example_defines + example_c_args,
   cpp_args: example_defines + example_cpp_args,
-  dependencies: [puglpp_dep, gl_backend_dep],
+  dependencies: [puglpp_dep, pugl_gl_dep],
   include_directories: include_directories('../../..'),
 )
diff --git a/examples/pugl_cursor_demo.app/MacOS/meson.build b/examples/pugl_cursor_demo.app/MacOS/meson.build
index 4de8b40..94359cd 100644
--- a/examples/pugl_cursor_demo.app/MacOS/meson.build
+++ b/examples/pugl_cursor_demo.app/MacOS/meson.build
@@ -6,6 +6,6 @@ executable(
   '../../pugl_cursor_demo.c',
   c_args: example_defines + example_c_args,
   cpp_args: example_defines + example_cpp_args,
-  dependencies: [pugl_dep, gl_backend_dep],
+  dependencies: [pugl_dep, pugl_gl_dep],
   include_directories: include_directories('../../..'),
 )
diff --git a/examples/pugl_embed_demo.app/MacOS/meson.build b/examples/pugl_embed_demo.app/MacOS/meson.build
index 13df15e..9e6dd58 100644
--- a/examples/pugl_embed_demo.app/MacOS/meson.build
+++ b/examples/pugl_embed_demo.app/MacOS/meson.build
@@ -6,6 +6,6 @@ executable(
   '../../pugl_embed_demo.c',
   c_args: example_defines + example_c_args,
   cpp_args: example_defines + example_cpp_args,
-  dependencies: [pugl_dep, gl_backend_dep],
+  dependencies: [pugl_dep, pugl_gl_dep],
   include_directories: include_directories('../../..'),
 )
diff --git a/examples/pugl_management_demo.app/MacOS/meson.build b/examples/pugl_management_demo.app/MacOS/meson.build
index 1ad7b21..69dafc7 100644
--- a/examples/pugl_management_demo.app/MacOS/meson.build
+++ b/examples/pugl_management_demo.app/MacOS/meson.build
@@ -6,6 +6,6 @@ executable(
   ['../../pugl_management_demo.c'],
   c_args: example_defines + example_c_args + cairo_args,
   cpp_args: example_defines + example_cpp_args,
-  dependencies: [pugl_dep, cairo_backend_dep],
+  dependencies: [pugl_dep, pugl_cairo_dep],
   include_directories: include_directories('../../..'),
 )
diff --git a/examples/pugl_shader_demo.app/MacOS/meson.build b/examples/pugl_shader_demo.app/MacOS/meson.build
index ea35862..0731864 100644
--- a/examples/pugl_shader_demo.app/MacOS/meson.build
+++ b/examples/pugl_shader_demo.app/MacOS/meson.build
@@ -10,6 +10,6 @@ executable(
   ],
   c_args: example_defines + example_c_args,
   cpp_args: example_defines + example_cpp_args,
-  dependencies: [pugl_dep, gl_backend_dep, dl_dep],
+  dependencies: [pugl_dep, pugl_gl_dep, dl_dep],
   include_directories: include_directories('../../..'), 
 )
diff --git a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build
index abecfb5..d75c75d 100644
--- a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build
+++ b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build
@@ -9,6 +9,6 @@ executable(
   ],
   c_args: example_defines + example_c_args,
   cpp_args: example_defines + example_cpp_args,
-  dependencies: [puglpp_dep, vulkan_backend_dep],
+  dependencies: [puglpp_dep, pugl_vulkan_dep],
   include_directories: include_directories('../../..'),
 )
diff --git a/examples/pugl_vulkan_demo.app/MacOS/meson.build b/examples/pugl_vulkan_demo.app/MacOS/meson.build
index fb7273f..0d07171 100644
--- a/examples/pugl_vulkan_demo.app/MacOS/meson.build
+++ b/examples/pugl_vulkan_demo.app/MacOS/meson.build
@@ -8,6 +8,6 @@ executable(
     '../../file_utils.c',
   ],
   c_args: example_defines + example_c_args,
-  dependencies: [pugl_dep, vulkan_backend_dep],
+  dependencies: [pugl_dep, pugl_vulkan_dep],
   include_directories: include_directories('../../..'),
 )
diff --git a/examples/pugl_window_demo.app/MacOS/meson.build b/examples/pugl_window_demo.app/MacOS/meson.build
index 9794cd4..7bfc219 100644
--- a/examples/pugl_window_demo.app/MacOS/meson.build
+++ b/examples/pugl_window_demo.app/MacOS/meson.build
@@ -6,6 +6,6 @@ executable(
   '../../pugl_window_demo.c',
   c_args: example_defines + example_c_args,
   cpp_args: example_defines + example_cpp_args,
-  dependencies: [pugl_dep, gl_backend_dep],
+  dependencies: [pugl_dep, pugl_gl_dep],
   include_directories: include_directories('../../..'),
 )
diff --git a/meson.build b/meson.build
index e46dc28..67e97a7 100644
--- a/meson.build
+++ b/meson.build
@@ -282,7 +282,7 @@ if get_option('stub')
     version: meson.project_version(),
   )
 
-  stub_backend_dep = declare_dependency(
+  pugl_stub_dep = declare_dependency(
     compile_args: extra_c_args,
     link_with: stub_backend,
     dependencies: [pugl_dep],
@@ -299,7 +299,7 @@ if get_option('stub')
     version: meson.project_version(),
   )
 
-  meson.override_dependency(stub_pkg_name, stub_backend_dep)
+  meson.override_dependency(stub_pkg_name, pugl_stub_dep)
 endif
 
 # OpenGL
@@ -324,7 +324,7 @@ if opengl_dep.found()
     version: meson.project_version(),
   )
 
-  gl_backend_dep = declare_dependency(
+  pugl_gl_dep = declare_dependency(
     compile_args: extra_c_args,
     link_with: gl_backend,
     dependencies: [pugl_dep, opengl_dep],
@@ -341,7 +341,7 @@ if opengl_dep.found()
     version: meson.project_version(),
   )
 
-  meson.override_dependency(gl_pkg_name, gl_backend_dep)
+  meson.override_dependency(gl_pkg_name, pugl_gl_dep)
 endif
 
 # Cairo
@@ -378,7 +378,7 @@ if cairo_dep.found()
     version: meson.project_version(),
   )
 
-  cairo_backend_dep = declare_dependency(
+  pugl_cairo_dep = declare_dependency(
     compile_args: extra_c_args,
     dependencies: [pugl_dep, cairo_dep],
     link_with: cairo_backend,
@@ -395,7 +395,7 @@ if cairo_dep.found()
     version: meson.project_version(),
   )
 
-  meson.override_dependency(cairo_pkg_name, cairo_backend_dep)
+  meson.override_dependency(cairo_pkg_name, pugl_cairo_dep)
 endif
 
 # Vulkan
@@ -432,7 +432,7 @@ if vulkan_dep.found()
     version: meson.project_version(),
   )
 
-  vulkan_backend_dep = declare_dependency(
+  pugl_vulkan_dep = declare_dependency(
     compile_args: extra_c_args,
     dependencies: [pugl_dep, vulkan_dep, thread_dep],
     link_with: vulkan_backend,
@@ -449,7 +449,7 @@ if vulkan_dep.found()
     version: meson.project_version(),
   )
 
-  meson.override_dependency(vulkan_pkg_name, vulkan_backend_dep)
+  meson.override_dependency(vulkan_pkg_name, pugl_vulkan_dep)
 endif
 
 ###############################
diff --git a/test/meson.build b/test/meson.build
index c7d01c1..b22a925 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -84,7 +84,7 @@ foreach test : basic_tests
       'test_' + test,
       'test_@0@.c'.format(test),
       c_args: test_c_args,
-      dependencies: [pugl_dep, stub_backend_dep],
+      dependencies: [pugl_dep, pugl_stub_dep],
       include_directories: include_directories(includes),
     ),
     suite: 'unit',
@@ -98,7 +98,7 @@ foreach test : basic_exclusive_tests
       'test_' + test,
       'test_@0@.c'.format(test),
       c_args: test_c_args,
-      dependencies: [pugl_dep, stub_backend_dep],
+      dependencies: [pugl_dep, pugl_stub_dep],
       include_directories: include_directories(includes),
     ),
     is_parallel: false,
@@ -114,7 +114,7 @@ if opengl_dep.found()
         'test_' + test,
         'test_@0@.c'.format(test),
         c_args: test_c_args,
-        dependencies: [pugl_dep, gl_backend_dep],
+        dependencies: [pugl_dep, pugl_gl_dep],
         include_directories: include_directories(includes),
       ),
       suite: 'unit',
@@ -130,7 +130,7 @@ if cairo_dep.found()
         'test_' + test,
         'test_@0@.c'.format(test),
         c_args: test_c_args + cairo_args,
-        dependencies: [pugl_dep, cairo_backend_dep],
+        dependencies: [pugl_dep, pugl_cairo_dep],
         include_directories: include_directories(includes),
       ),
       suite: 'unit',
@@ -147,7 +147,7 @@ if vulkan_dep.found()
         'test_@0@.c'.format(test),
         c_args: test_c_args,
         cpp_args: test_cpp_args,
-        dependencies: [pugl_dep, vulkan_backend_dep],
+        dependencies: [pugl_dep, pugl_vulkan_dep],
         include_directories: include_directories(includes),
       ),
       suite: 'unit',