summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam@afuera.me.uk>2018-07-16 21:36:20 +0200
committerSam Thursfield <sam@afuera.me.uk>2018-07-16 21:36:20 +0200
commit15395822fcf34f8da0fc42e89d9f7127e688bdfc (patch)
treebc80f3036048673fd3ef73927ce48ec1781e8f49
parent1b14115446a5bfd492f673049c784efc157eb2bd (diff)
downloadtracker-wip/sam/carlosg/direct-rewrite.tar.gz
Update meson build system for libtracker-direct changeswip/sam/carlosg/direct-rewrite
-rw-r--r--src/libtracker-direct/meson.build14
-rw-r--r--src/libtracker-sparql-backend/meson.build2
-rw-r--r--src/tracker-store/meson.build3
3 files changed, 5 insertions, 14 deletions
diff --git a/src/libtracker-direct/meson.build b/src/libtracker-direct/meson.build
index 8cf018c69..0c515eaa7 100644
--- a/src/libtracker-direct/meson.build
+++ b/src/libtracker-direct/meson.build
@@ -1,18 +1,6 @@
libtracker_direct = static_library('tracker-direct',
- 'tracker-direct.vala',
- 'tracker-namespace.vala',
- '../libtracker-common/libtracker-common.vapi',
- '../libtracker-data/libtracker-data.vapi',
+ 'tracker-direct.c',
c_args: tracker_c_args,
- vala_args: [
- '--debug',
- '--pkg', 'posix',
- # FIXME: Meson has code to add --target-glib automatically, but it
- # doesn't seem to work here.
- '--target-glib', glib_required,
- ],
- # This doesn't depend on tracker_common_dep because of
- # https://github.com/mesonbuild/meson/issues/671
dependencies: [ glib, gio, tracker_data_dep ],
include_directories: [commoninc, configinc, srcinc],
)
diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
index b04cdaf0d..d76143306 100644
--- a/src/libtracker-sparql-backend/meson.build
+++ b/src/libtracker-sparql-backend/meson.build
@@ -1,5 +1,7 @@
libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
'../libtracker-common/libtracker-common.vapi',
+ '../libtracker-data/libtracker-data.vapi',
+ '../libtracker-direct/tracker-direct.vapi',
'tracker-backend.vala',
soversion: soversion,
diff --git a/src/tracker-store/meson.build b/src/tracker-store/meson.build
index 91d7a335b..1c42da3a3 100644
--- a/src/tracker-store/meson.build
+++ b/src/tracker-store/meson.build
@@ -16,6 +16,7 @@ tracker_store_sources = [
'tracker-writeback.vapi',
'../libtracker-common/libtracker-common.vapi',
'../libtracker-data/libtracker-data.vapi',
+ '../libtracker-direct/tracker-direct.vapi',
]
tracker_store = executable('tracker-store',
@@ -25,7 +26,7 @@ tracker_store = executable('tracker-store',
],
vala_args: [ '--pkg', 'posix' ],
dependencies: [
- tracker_common_dep, tracker_data_dep,
+ tracker_common_dep, tracker_data_dep, tracker_sparql_direct_dep,
gio_unix
],
install: true,