From f3d4186e382c92356467693fbc405563f072fc5d Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 18 Oct 2017 17:55:02 +0100 Subject: meson: Include the gresource ontology data in libtracker-data Fixes an issue in tracker-store --- src/libtracker-data/meson.build | 2 ++ src/meson.build | 6 +++--- src/ontologies/meson.build | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libtracker-data/meson.build b/src/libtracker-data/meson.build index e85ed5f1f..a60f96e67 100644 --- a/src/libtracker-data/meson.build +++ b/src/libtracker-data/meson.build @@ -60,6 +60,8 @@ libtracker_data = library('tracker-data', tracker_common_enum_header, tracker_common_parser_sha1_header, tracker_data_enums[0], tracker_data_enums[1], + tracker_gresources[0], + tracker_gresources[1], c_args: tracker_c_args, install: true, install_dir: tracker_internal_libs_dir, diff --git a/src/meson.build b/src/meson.build index 5ebe9ffb5..04f7f3983 100644 --- a/src/meson.build +++ b/src/meson.build @@ -6,6 +6,9 @@ subdir('libtracker-common') # public libtracker-sparql library. subdir('libtracker-sparql') +# Public ontologies +subdir('ontologies') + # Internal database library subdir('gvdb') subdir('libtracker-fts') @@ -28,6 +31,3 @@ subdir('tracker') # Public shared database subdir('tracker-store') - -# Public ontologies -subdir('ontologies') diff --git a/src/ontologies/meson.build b/src/ontologies/meson.build index 7df2a2d66..b8b7d29af 100644 --- a/src/ontologies/meson.build +++ b/src/ontologies/meson.build @@ -47,7 +47,7 @@ nepomuk = [ 'nepomuk/93-libosinfo.ontology', ] -gnome.compile_resources('tracker_gresources', 'builtin-ontology.gresource.xml') +tracker_gresources = gnome.compile_resources('tracker_gresources', 'builtin-ontology.gresource.xml') install_data(internal_config, install_dir: tracker_ontologies_dir) -- cgit v1.2.1