[gnome-builder] build: compartmentalize xml-reader.c

[Christian Hergert <chergert src gnome org>]

commit 89b622635d54e5374036d5919b82e8606b7c0d14
Author: Christian Hergert <chergert redhat com>
Date:   Thu Sep 21 14:50:34 2017 -0700

    build: compartmentalize xml-reader.c
    
    This is only needed by DOAP parsing, even though lots of things were
    linking against it (which wouldn't have worked anyway statically, since
    it registers a GObject).

 meson.build                           |   11 +++++++----
 src/gstyle/meson.build                |    4 ++--
 src/libide/doap/meson.build           |    6 ++++++
 src/{xml => libide/doap}/xml-reader.c |    0
 src/{xml => libide/doap}/xml-reader.h |    0
 src/libide/meson.build                |   31 ++++++++++++++-----------------
 src/meson.build                       |    1 -
 src/plugins/xml-pack/meson.build      |   12 ++++--------
 src/xml/meson.build                   |   21 ---------------------
 9 files changed, 33 insertions(+), 53 deletions(-)
---
diff --git a/meson.build b/meson.build
index a3c0bf1..c9d3aff 100644
--- a/meson.build
+++ b/meson.build
@@ -165,15 +165,18 @@ ld_supports_version_script = cc.links('''
 message('Linker supports --version-script: @0@'.format(ld_supports_version_script))
 
 # Commonly used deps
+libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.26.0')
 libgio_dep = dependency('gio-2.0', version: '>= 2.53.2')
 libgiounix_dep = dependency('gio-unix-2.0')
 libgtk_dep = dependency('gtk+-3.0', version: '>= 3.22.1')
-libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0')
-libm_dep = cc.find_library('m', required: false)
+libgtksource_dep = dependency('gtksourceview-3.0', version: '>= 3.24.0')
 libjson_glib_dep = dependency('json-glib-1.0', version: '>= 1.2.0')
-libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.26.0')
-libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.26.0')
 libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.26.0')
+libm_dep = cc.find_library('m', required: false)
+libpangoft2_dep = dependency('pangoft2', version: '>= 1.38.0')
+libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0')
+libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.26.0')
+libxml2_dep = dependency('libxml-2.0', version: '>=2.9.0')
 
 libgd = subproject('libgd',
   default_options: [
diff --git a/src/gstyle/meson.build b/src/gstyle/meson.build
index 47d5b42..e6e2f26 100644
--- a/src/gstyle/meson.build
+++ b/src/gstyle/meson.build
@@ -69,10 +69,10 @@ libgstyle_sources = [
 ]
 
 libgstyle_deps = [
-  libgtk_dep,
   libdazzle_dep,
-  libxml_dep,
+  libgtk_dep,
   libm_dep,
+  libxml2_dep,
 ]
 
 libgstyle_link_args = []
diff --git a/src/libide/doap/meson.build b/src/libide/doap/meson.build
index b46c030..a704140 100644
--- a/src/libide/doap/meson.build
+++ b/src/libide/doap/meson.build
@@ -8,12 +8,18 @@ doap_sources = [
   'ide-doap.c',
 ]
 
+doap_private_sources = [
+  'xml-reader.c',
+  'xml-reader.h',
+]
+
 doap_enums = [
   'ide-doap.h',
 ]
 
 libide_public_headers += files(doap_headers)
 libide_public_sources += files(doap_sources)
+libide_private_sources += files(doap_private_sources)
 libide_enum_headers += files(doap_enums)
 
 install_headers(doap_headers, subdir: join_paths(libide_header_subdir, 'doap'))
diff --git a/src/xml/xml-reader.c b/src/libide/doap/xml-reader.c
similarity index 100%
rename from src/xml/xml-reader.c
rename to src/libide/doap/xml-reader.c
diff --git a/src/xml/xml-reader.h b/src/libide/doap/xml-reader.h
similarity index 100%
rename from src/xml/xml-reader.h
rename to src/libide/doap/xml-reader.h
diff --git a/src/libide/meson.build b/src/libide/meson.build
index cdf01fc..c44b61d 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -32,6 +32,20 @@ libide_build_ident_h = vcs_tag(
 )
 libide_generated_headers += [libide_build_ident_h]
 
+libide_deps = [
+  libdazzle_dep,
+  libgd_dep,
+  libgio_dep,
+  libgiounix_dep,
+  libgtk_dep,
+  libgtksource_dep,
+  libjson_glib_dep,
+  libjsonrpc_glib_dep,
+  libpangoft2_dep,
+  libpeas_dep,
+  libtemplate_glib_dep,
+  libxml2_dep,
+]
 
 libide_public_headers += [
   'ide.h',
@@ -146,23 +160,6 @@ libide_sources = libide_private_sources + libide_generated_headers + libide_publ
   'ide-internal.h',
 ]
 
-libgtksource_dep = dependency('gtksourceview-3.0', version: '>= 3.22.0')
-
-libide_deps = [
-  dependency('pangoft2', version: '>= 1.38.0'),
-  libgtksource_dep,
-  libgio_dep,
-  libgiounix_dep,
-  libgtk_dep,
-  libpeas_dep,
-  libdazzle_dep,
-  libtemplate_glib_dep,
-  libxml_dep,
-  libgd_dep,
-  libjson_glib_dep,
-  libjsonrpc_glib_dep,
-]
-
 contrib_dir = join_paths(meson.source_root(), 'contrib/')
 
 if get_option('with_webkit')
diff --git a/src/meson.build b/src/meson.build
index 4af47c1..f49e4ab 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,5 +1,4 @@
 subdir('libeditorconfig')
-subdir('xml')
 subdir('gstyle')
 subdir('libide')
 subdir('plugins')
diff --git a/src/plugins/xml-pack/meson.build b/src/plugins/xml-pack/meson.build
index 7baa841..d8878c1 100644
--- a/src/plugins/xml-pack/meson.build
+++ b/src/plugins/xml-pack/meson.build
@@ -70,16 +70,12 @@ xml_pack_sources = [
   'xml-pack-plugin.c',
 ]
 
-xml_pack_deps = plugin_deps + [
-  libxml_dep,
-]
-
 shared_module('xml-pack-plugin', xml_pack_sources,
-  dependencies: xml_pack_deps,
-  link_args: plugin_link_args,
+  dependencies: plugin_deps,
+     link_args: plugin_link_args,
   link_depends: plugin_link_deps,
-  install: true,
-  install_dir: plugindir,
+       install: true,
+   install_dir: plugindir,
 )
 
 configure_file(