Browse Source

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>
Stephan Lachnit 4 years ago
parent
commit
d8337aeb05
3 changed files with 10 additions and 10 deletions
  1. 1 1
      daemon/meson.build
  2. 1 2
      example/meson.build
  3. 8 7
      lib/meson.build

+ 1 - 1
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(

+ 1 - 2
example/meson.build

@@ -5,8 +5,7 @@ executable(
         'main.c',
     ],
     dependencies: [
-        libgamemode_dep,
-        libdl,
+        gamemode_dep,
     ],
     install: true,
     install_dir: path_bindir,

+ 8 - 7
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,
 )