[tracker] build: Cleanup TRACKER_COMPILATION defines from c_args
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] build: Cleanup TRACKER_COMPILATION defines from c_args
- Date: Wed, 19 Jul 2017 12:24:10 +0000 (UTC)
commit 5022b3ff56fb2f2a0dd5da3624521a635fb40a07
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Jul 19 13:29:34 2017 +0200
build: Cleanup TRACKER_COMPILATION defines from c_args
It is now defined globally, so can removed from specific targets.
docs/tools/meson.build | 3 +--
meson.build | 2 --
src/libtracker-sparql-backend/meson.build | 3 ---
src/libtracker-sparql/meson.build | 3 ---
tests/libtracker-miner/meson.build | 1 -
5 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/docs/tools/meson.build b/docs/tools/meson.build
index bb4076c..7be6dd7 100644
--- a/docs/tools/meson.build
+++ b/docs/tools/meson.build
@@ -8,5 +8,4 @@ ttl_loader_files = [
ttl2sgml = executable('ttl2sgml',
ttl_loader_files, 'ttl2sgml.c', 'ttlresource2sgml.c',
- dependencies: [tracker_data_dep, tracker_sparql_dep],
- c_args: ['-DTRACKER_COMPILATION'])
+ dependencies: [tracker_data_dep, tracker_sparql_dep])
diff --git a/meson.build b/meson.build
index b07cbb0..f32d1d7 100644
--- a/meson.build
+++ b/meson.build
@@ -407,8 +407,6 @@ tracker_c_args = [
# Needed for statvfs64, and probably other stuff
'-D_LARGEFILE64_SOURCE',
-
- '-DTRACKER_COMPILATION'
]
have_tracker_miner_fs = true
diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
index b4b3d3b..8ebb4ad 100644
--- a/src/libtracker-sparql-backend/meson.build
+++ b/src/libtracker-sparql-backend/meson.build
@@ -2,8 +2,6 @@ libtracker_sparql = library('tracker-sparql-' + tracker_api_version,
'../libtracker-common/libtracker-common.vapi',
'tracker-backend.vala',
- c_args: ['-DTRACKER_COMPILATION'],
-
install: true,
install_rpath: tracker_internal_libs_dir,
@@ -40,7 +38,6 @@ tracker_sparql_c_gir = gnome.generate_gir(libtracker_sparql,
link_with: libtracker_sparql,
extra_args: [
'--c-include', 'libtracker-sparql/tracker-sparql.h',
- '-D', 'TRACKER_COMPILATION',
])
tracker_sparql_c_gir = tracker_sparql_c_gir[0] # Ignore this .typelib
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index b4af625..129f673 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -73,9 +73,6 @@ libtracker_sparql_intermediate_c = static_library('tracker-sparql-intermediate-c
enums_c, enums_h,
libtracker_sparql_c_sources,
dependencies: [tracker_common_dep],
- c_args: [
- '-DTRACKER_COMPILATION',
- ],
)
tracker_sparql_intermediate_dep = declare_dependency(
diff --git a/tests/libtracker-miner/meson.build b/tests/libtracker-miner/meson.build
index 85c2a2f..d1ed36f 100644
--- a/tests/libtracker-miner/meson.build
+++ b/tests/libtracker-miner/meson.build
@@ -1,7 +1,6 @@
test_c_args = [
'-DLIBEXEC_PATH="@0@/@1@"'.format(get_option('prefix'), get_option('libexecdir')),
'-DTEST',
- '-DTRACKER_COMPILATION',
'-DTEST_DATA_DIR="@0@/data"'.format(meson.current_source_dir()),
'-DTEST_MINERS_DIR="@0@/mock-miners"'.format(meson.current_source_dir()),
'-DTEST_ONTOLOGIES_DIR="@0@/src/ontologies/nepomuk"'.format(meson.current_source_dir()),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]