Commit c3497c31 authored by Andrea Azzarone's avatar Andrea Azzarone 🚴

meson: Enforce build order using generated headers directly

Both libtracker-fts and libtracker-data end up requiring includes from
tracker-sparql.h, but we have to generate tracker-generated.h first. To
solve this, commit a452173e introduced a dependency to an intermediate
target (tracker_sparql_intermediate_dep). Use directly the custom target
tracker_sparql_generated_header to enforce build order.

Closes: #78
parent 34437f01
...@@ -66,6 +66,7 @@ libtracker_data = library('tracker-data', ...@@ -66,6 +66,7 @@ libtracker_data = library('tracker-data',
tracker_data_enums[1], tracker_data_enums[1],
tracker_gresources[0], tracker_gresources[0],
tracker_gresources[1], tracker_gresources[1],
tracker_sparql_generated_header,
c_args: tracker_c_args, c_args: tracker_c_args,
install: true, install: true,
install_dir: tracker_internal_libs_dir, install_dir: tracker_internal_libs_dir,
...@@ -76,7 +77,7 @@ libtracker_data = library('tracker-data', ...@@ -76,7 +77,7 @@ libtracker_data = library('tracker-data',
# symbols from libtracker-sparql, but does not mean it should # symbols from libtracker-sparql, but does not mean it should
# be linked to it. # be linked to it.
override_options: ['b_lundef=false'], override_options: ['b_lundef=false'],
dependencies: tracker_data_dependencies + [unicode_library, tracker_sparql_intermediate_dep], dependencies: tracker_data_dependencies + [unicode_library],
include_directories: [commoninc, configinc, srcinc], include_directories: [commoninc, configinc, srcinc],
) )
......
...@@ -11,7 +11,8 @@ libtracker_fts = static_library('tracker-fts', ...@@ -11,7 +11,8 @@ libtracker_fts = static_library('tracker-fts',
'tracker-fts-config.c', 'tracker-fts-config.c',
'tracker-fts-tokenizer.c', 'tracker-fts-tokenizer.c',
libtracker_fts_fts5, libtracker_fts_fts5,
dependencies: [tracker_common_dep, tracker_sparql_intermediate_dep], tracker_sparql_generated_header,
dependencies: [tracker_common_dep],
c_args: tracker_c_args c_args: tracker_c_args
) )
......
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