[gedit/zbrown/deteplification-src: 66/633] build: rename a variable




commit 714a7823634938c94e6f1ac76870070a178c2934
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed Dec 4 14:17:44 2019 +0100

    build: rename a variable

 docs/reference/meson.build         | 2 +-
 gedit/meson.build                  | 4 ++--
 meson.build                        | 2 +-
 plugins/checkupdate/meson.build    | 2 +-
 plugins/docinfo/meson.build        | 2 +-
 plugins/filebrowser/meson.build    | 2 +-
 plugins/modelines/meson.build      | 2 +-
 plugins/quickhighlight/meson.build | 2 +-
 plugins/sort/meson.build           | 2 +-
 plugins/spell/meson.build          | 2 +-
 plugins/time/meson.build           | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index a3a2fc720..fe3c1b3f0 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -20,7 +20,7 @@ gedit_doc_deps = [
 
 gedit_doc_dep = declare_dependency(
   link_with: libgedit_sha,
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: gedit_doc_deps,
   sources: libgedit_dep_sources,
 )
diff --git a/gedit/meson.build b/gedit/meson.build
index ea2345665..afba6d42d 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -193,7 +193,7 @@ install_headers(
 libgedit_sha = shared_library(
   package_string,
   libgedit_sources + [libgedit_enums.get(1), libgedit_res.get(1)],
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: libgedit_deps,
   c_args: libgedit_c_args,
   link_args: libgedit_link_args,
@@ -259,7 +259,7 @@ endif
 
 libgedit_dep = declare_dependency(
   link_with: libgedit_sha,
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: libgedit_deps,
   sources: libgedit_dep_sources,
 )
diff --git a/meson.build b/meson.build
index f7cb628d2..ee54fb515 100644
--- a/meson.build
+++ b/meson.build
@@ -14,7 +14,7 @@ api_version = '3.36'
 package_string = '@0@-@1@'.format(meson.project_name(), api_version)
 
 # Paths
-rootdir = include_directories('.')
+root_include_dir = include_directories('.')
 
 srcdir = meson.current_source_dir()
 builddir = meson.current_build_dir()
diff --git a/plugins/checkupdate/meson.build b/plugins/checkupdate/meson.build
index 94b4e8b0d..250112fc3 100644
--- a/plugins/checkupdate/meson.build
+++ b/plugins/checkupdate/meson.build
@@ -14,7 +14,7 @@ libcheckupdate_c_args = [
 libcheckupdate_sha = shared_module(
   'checkupdate',
   sources: libcheckupdate_sources,
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: libcheckupdate_deps,
   c_args: libcheckupdate_c_args,
   install: true,
diff --git a/plugins/docinfo/meson.build b/plugins/docinfo/meson.build
index d59951de8..c13d9a62c 100644
--- a/plugins/docinfo/meson.build
+++ b/plugins/docinfo/meson.build
@@ -15,7 +15,7 @@ subdir('resources')
 libdocinfo_sha = shared_module(
   'docinfo',
   sources: libdocinfo_sources,
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: libdocinfo_deps,
   c_args: libdocinfo_c_args,
   install: true,
diff --git a/plugins/filebrowser/meson.build b/plugins/filebrowser/meson.build
index fe5a5767e..da60e76ac 100644
--- a/plugins/filebrowser/meson.build
+++ b/plugins/filebrowser/meson.build
@@ -67,7 +67,7 @@ subdir('resources')
 libfilebrowser_sha = shared_module(
   'filebrowser',
   sources: libfilebrowser_sources,
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: libfilebrowser_deps,
   c_args: libfilebrowser_c_args,
   install: true,
diff --git a/plugins/modelines/meson.build b/plugins/modelines/meson.build
index 598dfe194..4b3984736 100644
--- a/plugins/modelines/meson.build
+++ b/plugins/modelines/meson.build
@@ -14,7 +14,7 @@ libmodelines_c_args = [
 libmodelines_sha = shared_module(
   'modelines',
   sources: libmodelines_sources,
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: libmodelines_deps,
   c_args: libmodelines_c_args,
   install: true,
diff --git a/plugins/quickhighlight/meson.build b/plugins/quickhighlight/meson.build
index 0580a63fb..3918b93e2 100644
--- a/plugins/quickhighlight/meson.build
+++ b/plugins/quickhighlight/meson.build
@@ -13,7 +13,7 @@ libquickhighlight_c_args = [
 libquickhighlight_sha = shared_module(
   'quickhighlight',
   sources: libquickhighlight_sources,
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: libquickhighlight_deps,
   c_args: libquickhighlight_c_args,
   install: true,
diff --git a/plugins/sort/meson.build b/plugins/sort/meson.build
index 187dfc01f..406d9f6a8 100644
--- a/plugins/sort/meson.build
+++ b/plugins/sort/meson.build
@@ -15,7 +15,7 @@ subdir('resources')
 libsort_sha = shared_module(
   'sort',
   sources: libsort_sources,
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: libsort_deps,
   c_args: libsort_c_args,
   install: true,
diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
index f6fe6255b..a39f80e5c 100644
--- a/plugins/spell/meson.build
+++ b/plugins/spell/meson.build
@@ -17,7 +17,7 @@ subdir('resources')
 libspell_sha = shared_module(
   'spell',
   sources: libspell_sources,
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: libspell_deps,
   c_args: libspell_c_args,
   install: true,
diff --git a/plugins/time/meson.build b/plugins/time/meson.build
index 657ac694c..ea867601c 100644
--- a/plugins/time/meson.build
+++ b/plugins/time/meson.build
@@ -31,7 +31,7 @@ subdir('resources')
 libtime_sha = shared_module(
   'time',
   sources: libtime_sources,
-  include_directories: rootdir,
+  include_directories: root_include_dir,
   dependencies: libtime_deps,
   c_args: libtime_c_args,
   install: true,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]