Mesa (master): meson: move idep_xmlconfig_headers to xmlpool/

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c32236811d05371a152e7f2de0a9abf0b4e3fe11
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c32236811d05371a152e7f2de0a9abf0b4e3fe11

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Thu Oct 31 15:35:29 2019 +0000

meson: move idep_xmlconfig_headers to xmlpool/

That's where `xmlpool_options_h` is defined, and this way we can make sure
nobody starts making use of it in the future :)

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Acked-by: Dylan Baker <dylan at pnwbakers.com>

---

 src/util/meson.build         | 5 -----
 src/util/xmlpool/meson.build | 7 ++++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/util/meson.build b/src/util/meson.build
index ce50d81e688..972d757195a 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -187,11 +187,6 @@ _libxmlconfig = static_library(
   build_by_default : false,
 )
 
-idep_xmlconfig_headers = declare_dependency(
-  sources : xmlpool_options_h,
-  include_directories : inc_util,
-)
-
 idep_xmlconfig = declare_dependency(
   dependencies : [idep_xmlconfig_headers, dep_expat],
   link_with : _libxmlconfig,
diff --git a/src/util/xmlpool/meson.build b/src/util/xmlpool/meson.build
index d0ecec4937f..9d9ab8a0bf8 100644
--- a/src/util/xmlpool/meson.build
+++ b/src/util/xmlpool/meson.build
@@ -25,7 +25,7 @@ foreach lang : _langs
   _langs_po_files += files(lang + '.po')
 endforeach
 
-xmlpool_options_h = custom_target(
+_xmlpool_options_h = custom_target(
   'xmlpool_options.h',
   input : ['gen_xmlpool.py', 't_options.h'],
   output : 'options.h',
@@ -36,6 +36,11 @@ xmlpool_options_h = custom_target(
   depend_files : _langs_po_files,
 )
 
+idep_xmlconfig_headers = declare_dependency(
+  sources : _xmlpool_options_h,
+  include_directories : inc_util,
+)
+
 if host_machine.system() != 'windows'
   i18n = import('i18n')
   i18n.gettext('xmlpool', install : false)