Commit 89b62263 authored by Christian Hergert's avatar Christian Hergert
Browse files

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).
parent 18e19ebe
......@@ -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: [
......
......@@ -69,10 +69,10 @@ libgstyle_sources = [
]
libgstyle_deps = [
libgtk_dep,
libdazzle_dep,
libxml_dep,
libgtk_dep,
libm_dep,
libxml2_dep,
]
libgstyle_link_args = []
......
......@@ -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'))
......@@ -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')
......
subdir('libeditorconfig')
subdir('xml')
subdir('gstyle')
subdir('libide')
subdir('plugins')
......
......@@ -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(
......
libxml_sources = [
'xml-reader.c',
]
libxml2_dep = dependency('libxml-2.0', version: '>=2.9.0')
libxml_deps = [
libgio_dep,
libxml2_dep,
]
libxml = static_library('xml', libxml_sources,
dependencies: libxml_deps,
pic: true,
)
libxml_dep = declare_dependency(
link_with: libxml,
dependencies: libxml2_dep,
include_directories: include_directories('.'),
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment