[tracker/wip/carlosg/shuffle-dirs: 14/15] build: Provide a file() set for each libtracker-sparql subdir
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/carlosg/shuffle-dirs: 14/15] build: Provide a file() set for each libtracker-sparql subdir
- Date: Sun, 3 Apr 2022 17:49:58 +0000 (UTC)
commit 577ac46e9a7e8846749233d9d0caafbe5a21f0d3
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Apr 3 16:36:22 2022 +0200
build: Provide a file() set for each libtracker-sparql subdir
We want to coalesce libtracker-sparql building into a monolithic
library. This is a first step towards avoiding the intermediate
static libraries.
src/libtracker-sparql/bus/meson.build | 6 +++++-
src/libtracker-sparql/core/meson.build | 9 ++++++++-
src/libtracker-sparql/direct/meson.build | 6 +++++-
3 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/src/libtracker-sparql/bus/meson.build b/src/libtracker-sparql/bus/meson.build
index 59caf678e..d7c2be390 100644
--- a/src/libtracker-sparql/bus/meson.build
+++ b/src/libtracker-sparql/bus/meson.build
@@ -1,9 +1,13 @@
-libtracker_bus = static_library('tracker-bus',
+bus_files = files(
'tracker-bus.vala',
'tracker-namespace.vala',
'tracker-bus-batch.vala',
'tracker-bus-fd-cursor.vala',
'tracker-bus-statement.vala',
+)
+
+libtracker_bus = static_library('tracker-bus',
+ bus_files,
'../../libtracker-common/libtracker-common.vapi',
c_args: tracker_c_args + [
'-include', 'libtracker-sparql/tracker-private.h',
diff --git a/src/libtracker-sparql/core/meson.build b/src/libtracker-sparql/core/meson.build
index c40cfa561..d93329f9d 100644
--- a/src/libtracker-sparql/core/meson.build
+++ b/src/libtracker-sparql/core/meson.build
@@ -8,7 +8,7 @@ tracker_data_dependencies = [
tracker_common_dep, gvdb_dep, sqlite,
]
-libtracker_data = static_library('tracker-data',
+core_files = files(
'tracker-class.c',
'tracker-collation.c',
'tracker-data-manager.c',
@@ -32,8 +32,15 @@ libtracker_data = static_library('tracker-data',
'tracker-uuid.c',
'tracker-vtab-service.c',
'tracker-vtab-triples.c',
+)
+
+core_files += [
tracker_data_enums[0],
tracker_data_enums[1],
+]
+
+libtracker_data = static_library('tracker-data',
+ core_files,
c_args: tracker_c_args,
gnu_symbol_visibility: 'hidden',
# We do *not* want --no-undefined here, this library uses
diff --git a/src/libtracker-sparql/direct/meson.build b/src/libtracker-sparql/direct/meson.build
index 9f5ed7b95..e2e8a7491 100644
--- a/src/libtracker-sparql/direct/meson.build
+++ b/src/libtracker-sparql/direct/meson.build
@@ -1,7 +1,11 @@
-libtracker_direct = static_library('tracker-direct',
+direct_files = files(
'tracker-direct.c',
'tracker-direct-batch.c',
'tracker-direct-statement.c',
+)
+
+libtracker_direct = static_library('tracker-direct',
+ direct_files,
c_args: tracker_c_args + [
'-include', 'libtracker-sparql/tracker-private.h',
],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]