summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2019-10-31 15:35:29 +0000
committerEric Engestrom <[email protected]>2019-10-31 16:03:57 +0000
commitc32236811d05371a152e7f2de0a9abf0b4e3fe11 (patch)
tree4fd7628fa6b837b0ebeb9e0b6b3bc3ccc81d6c71
parent02d940306790772d5fb303c1ac527f2702914cac (diff)
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 <[email protected]> Acked-by: Dylan Baker <[email protected]>
-rw-r--r--src/util/meson.build5
-rw-r--r--src/util/xmlpool/meson.build7
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)