diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2020-06-24 20:46:34 +0200 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2020-06-24 20:46:34 +0200 |
| commit | d33d83fcf614577c2f04404b6ad8665c4755a173 (patch) | |
| tree | 529ef8badc8875998b986de500ff0bece76cb3b8 | |
| parent | 1a23b2738035e7b6e73b1256e4fe45070d397e60 (diff) | |
| download | tracker-sam/circular-dep-fix.tar.gz | |
libtracker-sparql: Build libtracker-bus before libtracker-sparqlsam/circular-dep-fix
We have a dependency cycle otherwise which can cause build failures
when tracker-notifier.c is built before the tracker-bus.h header is
generated by `valac`.
| -rw-r--r-- | src/libtracker-sparql/bus/meson.build | 2 | ||||
| -rw-r--r-- | src/libtracker-sparql/meson.build | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libtracker-sparql/bus/meson.build b/src/libtracker-sparql/bus/meson.build index 54629e09a..19365c69b 100644 --- a/src/libtracker-sparql/bus/meson.build +++ b/src/libtracker-sparql/bus/meson.build @@ -15,7 +15,7 @@ libtracker_bus = static_library('tracker-bus', # doesn't seem to work here. '--target-glib', glib_required, ], - dependencies: [tracker_common_dep, tracker_sparql_intermediate_dep, tracker_sparql_vapi_dep], + dependencies: [tracker_common_dep, tracker_sparql_vapi_dep], include_directories: [commoninc, configinc, srcinc], gnu_symbol_visibility: 'hidden', ) diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build index 0f904e189..af8f10ce3 100644 --- a/src/libtracker-sparql/meson.build +++ b/src/libtracker-sparql/meson.build @@ -9,6 +9,8 @@ enum_types = gnome.mkenums('tracker-sparql-enum-types', tracker_sparql_vapi = files('tracker-sparql.vapi') tracker_sparql_vapi_dep = meson.get_compiler('vala').find_library('tracker-sparql', dirs: meson.current_source_dir()) +subdir('bus') + libtracker_sparql_c_sources = files( 'tracker-connection.c', 'tracker-cursor.c', @@ -71,9 +73,8 @@ install_data( install_dir: vapi_dir, ) -subdir('bus') -subdir('direct') subdir('remote') +subdir('direct') libtracker_sparql = library('tracker-sparql-' + tracker_api_version, '../libtracker-common/libtracker-common.vapi', |