summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam@afuera.me.uk>2020-09-01 10:03:38 +0000
committerSam Thursfield <sam@afuera.me.uk>2020-09-01 10:03:38 +0000
commit24e38cbbb5aaad569e19b419d0f3ecb8fbea0e8d (patch)
tree31733c4ce1cc00f3c111711db348e69afd4c2351
parentd386eafd5cf09273386f37a2b90d22229a1c4d00 (diff)
parentf78d99d947587a0e88d0cb9eb4c15795cb124a83 (diff)
downloadtracker-24e38cbbb5aaad569e19b419d0f3ecb8fbea0e8d.tar.gz
Merge branch 'wip/carlosg/libtracker-data-static' into 'master'
libtracker-data: Make a static library See merge request GNOME/tracker!307
-rw-r--r--src/libtracker-data/meson.build5
-rw-r--r--src/libtracker-sparql/meson.build1
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libtracker-data/meson.build b/src/libtracker-data/meson.build
index 3ff0f3194..469cd0c64 100644
--- a/src/libtracker-data/meson.build
+++ b/src/libtracker-data/meson.build
@@ -10,7 +10,7 @@ tracker_data_dependencies = [
tracker_data_dependencies += tracker_fts_dep
-libtracker_data = library('tracker-data',
+libtracker_data = static_library('tracker-data',
'tracker-class.c',
'tracker-collation.c',
'tracker-crc32.c',
@@ -35,10 +35,7 @@ libtracker_data = library('tracker-data',
tracker_common_enum_header,
tracker_data_enums[0],
tracker_data_enums[1],
- tracker_gresources,
c_args: tracker_c_args,
- install: true,
- install_dir: tracker_internal_libs_dir,
# This doesn't depend on tracker_common_dep because of
# https://github.com/mesonbuild/meson/issues/671
# We do *not* want --no-undefined here, this library uses
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index 8f01c29e3..9f66bf88c 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -82,6 +82,7 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
'../libtracker-data/libtracker-data.vapi',
'direct/tracker-direct.vapi',
'tracker-backend.vala',
+ tracker_gresources,
gnu_symbol_visibility: 'hidden',