Commit b312cc8b authored by Guido Gunther's avatar Guido Gunther Committed by Guido Gunther

Move glade catalog from data/ to glade/

Given that there will be more complex widgets lets keep the catalog
and module together.
parent b7a41f59
glade_xml = 'glade/libhandy.xml'
if get_option('glade_catalog')
gladeui = dependency('gladeui-2.0')
dtd = join_paths(gladeui.get_pkgconfig_variable('catalogdir'), 'glade-catalog.dtd')
glade_catalogdir = join_paths(get_option('prefix'), get_option('datadir'), 'glade', 'catalogs')
install_data(glade_xml, install_dir: glade_catalogdir)
xmllint = find_program('xmllint', required: true)
if xmllint.found()
custom_target(
'xmllint',
build_by_default: true,
input: glade_xml,
output: 'doesnotexist',
command: [xmllint, '--dtdvalid', dtd, '--noout', '@INPUT@'],
)
endif
endif
if get_option('glade_catalog')
gladeui_dep = dependency('gladeui-2.0')
module_dir = gladeui_dep.get_pkgconfig_variable('moduledir')
glade_xml = 'libhandy.xml'
gladeui_dep = dependency('gladeui-2.0')
module_dir = gladeui_dep.get_pkgconfig_variable('moduledir')
dtd = join_paths(gladeui_dep.get_pkgconfig_variable('catalogdir'), 'glade-catalog.dtd')
glade_catalogdir = join_paths(get_option('prefix'), get_option('datadir'), 'glade', 'catalogs')
libglade_hdy_sources = [
'glade-hdy-header-group.c',
]
libglade_hdy_sources = [
'glade-hdy-header-group.c',
]
libglade_hdy_deps = [
libhandy_dep,
gladeui_dep,
]
libglade_hdy_deps = [
libhandy_dep,
gladeui_dep,
]
libglade_hdy_args = []
libglade_hdy = shared_library(
'glade-handy',
libglade_hdy_sources,
c_args: libglade_hdy_args,
dependencies: libglade_hdy_deps,
include_directories: [ root_inc, src_inc ],
install: true,
install_dir: module_dir,
libglade_hdy_args = []
# Our custom glade module
libglade_hdy = shared_library(
'glade-handy',
libglade_hdy_sources,
c_args: libglade_hdy_args,
dependencies: libglade_hdy_deps,
include_directories: [ root_inc, src_inc ],
install: true,
install_dir: module_dir,
)
# Validate glade catalog
xmllint = find_program('xmllint', required: true)
if xmllint.found()
custom_target(
'xmllint',
build_by_default: true,
input: glade_xml,
output: 'doesnotexist',
command: [xmllint, '--dtdvalid', dtd, '--noout', '@INPUT@'],
)
endif
# Install glade catalog
install_data(glade_xml, install_dir: glade_catalogdir)
endif
......@@ -117,7 +117,6 @@ subdir('src')
subdir('examples')
subdir('tests')
subdir('doc')
subdir('data')
subdir('glade')
run_data = configuration_data()
......
......@@ -3,7 +3,7 @@
ABS_BUILDDIR='@ABS_BUILDDIR@'
ABS_SRCDIR='@ABS_SRCDIR@'
export GLADE_CATALOG_SEARCH_PATH="${ABS_SRCDIR}/data/glade/:${GLADE_CATALOG_SEARCH_PATH}"
export GLADE_CATALOG_SEARCH_PATH="${ABS_SRCDIR}/glade/:${GLADE_CATALOG_SEARCH_PATH}"
export GI_TYPELIB_PATH="${ABS_BUILDDIR}/src:$GI_TYPELIB_PATH"
export LD_LIBRARY_PATH="${ABS_BUILDDIR}/src:${ABS_BUILDDIR}/glade:$LD_LIBRARY_PATH"
export PKG_CONFIG_PATH="${ABS_BUILDDIR}/src:$PKG_CONFIG_PATH"
......
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