From d8337aeb05575f7beb408d56b43b2bde1ec10c99 Mon Sep 17 00:00:00 2001
From: Stephan Lachnit <stephanlachnit@protonmail.com>
Date: Wed, 17 Jun 2020 11:32:43 +0200
Subject: [PATCH] various variable naming improvements

This makes it more clear that libgamemode and libgamemodeauto are indeed libraries. Also, the misleading name `libgamemode_dep` has been renamed to `gamemode_dep`, which now also includes the dependency on libdl. The misleading `libgamemode_includes` variable name has also been changed.

Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
---
 daemon/meson.build  |  2 +-
 example/meson.build |  3 +--
 lib/meson.build     | 15 ++++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/daemon/meson.build b/daemon/meson.build
index c9ab0b9..b5bb5fb 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -11,7 +11,7 @@ daemon_sources = [
     'gamemode-config.c',
 ]
 
-gamemoded_includes = libgamemode_includes
+gamemoded_includes = gamemode_headers_includes
 gamemoded_includes += config_h_dir
 
 gamemoded = executable(
diff --git a/example/meson.build b/example/meson.build
index 02a7422..a1060e3 100644
--- a/example/meson.build
+++ b/example/meson.build
@@ -5,8 +5,7 @@ executable(
         'main.c',
     ],
     dependencies: [
-        libgamemode_dep,
-        libdl,
+        gamemode_dep,
     ],
     install: true,
     install_dir: path_bindir,
diff --git a/lib/meson.build b/lib/meson.build
index 587e9d8..8aa5103 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -6,7 +6,7 @@ lt_age = '0'
 lt_version = '@0@.@1@.@2@'.format(lt_current, lt_age, lt_revision)
 
 # Main client library to message the daemon
-gamemode = shared_library(
+libgamemode = shared_library(
     'gamemode',
     sources: [
         'client_impl.c',
@@ -20,12 +20,12 @@ gamemode = shared_library(
     version: lt_version,
 )
 
-libgamemode_includes = [
+gamemode_headers_includes = [
     include_directories('.'),
 ]
 
 # Small library to automatically use gamemode
-gamemodeauto = both_libraries(
+libgamemodeauto = both_libraries(
     'gamemodeauto',
     sources: [
         'client_loader.c',
@@ -72,10 +72,11 @@ pkg.generate(
   ],
 )
 
-# Dependency objects for the libs
-libgamemode_dep = declare_dependency(
-  include_directories: libgamemode_includes,
+# Dependency objects
+gamemode_dep = declare_dependency(
+  include_directories: gamemode_headers_includes,
+  dependencies: libdl,
 )
 libgamemodeauto_dep = declare_dependency(
-  link_with: gamemodeauto,
+  link_with: libgamemodeauto,
 )