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@intel.com>
Acked-by: Dylan Baker <dylan@pnwbakers.com>

diff --git a/src/util/meson.build b/src/util/meson.build
index ce50d81e688c1cd19949b54586d5015280abf048..972d757195a5059567be354cbab7d30946682960 100644 (file)
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -187,11 +187,6 @@ _libxmlconfig = static_library(
   build_by_default : false,
 )
 
   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,
 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 d0ecec4937fdd08e8e78e36ea081ee2a333c8a19..9d9ab8a0bf83caecc042b35a8ee557126a16f7be 100644 (file)
--- 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
 
   _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',
   '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,
 )
 
   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)
 if host_machine.system() != 'windows'
   i18n = import('i18n')
   i18n.gettext('xmlpool', install : false)