[tracker-miners/sam/meson-subproject: 1/2] Rename libtracker-common to libtracker-miners-common
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/sam/meson-subproject: 1/2] Rename libtracker-common to libtracker-miners-common
- Date: Tue, 31 Oct 2017 17:31:00 +0000 (UTC)
commit 861bf62f527587062cc7440c181459c751d45a42
Author: Sam Thursfield <sam thursfield codethink co uk>
Date: Tue Oct 31 14:49:04 2017 +0000
Rename libtracker-common to libtracker-miners-common
We made a big compromise when splitting tracker core from tracker-miners
in that the common code that was needed by both parts would end up
duplicated. It's ugly but it works fine at the moment and allows us to
keep all of the common code private.
I had an issue when trying to embed tracker core into tracker-miners as
a Meson subproject though. Having two targets named tracker-common
caused confusion as duplicate targets aren't allowed, but they are not
quite equivalent so we can't just pick one or the other.
To work around this, I've renamed the copy in this repo to
tracker-miners-common. This only affects the target names, not the
actual function names.
src/Makefile.am | 2 +-
src/libtracker-extract/Makefile.am | 2 +-
src/libtracker-extract/meson.build | 2 +-
src/libtracker-extract/tracker-guarantee.c | 4 +-
src/libtracker-extract/tracker-utils.c | 4 +-
src/libtracker-extract/tracker-xmp.c | 2 +-
.../.gitignore | 0
.../COPYING.LIB | 0
.../Makefile.am | 10 ++--
.../libtracker-common.vapi | 20 ++++----
.../meson.build | 30 ++++++------
.../tracker-common.h | 2 +-
.../tracker-date-time.c | 0
.../tracker-date-time.h | 2 +-
.../tracker-dbus.c | 0
.../tracker-dbus.h | 2 +-
.../tracker-domain-ontology.c | 0
.../tracker-domain-ontology.h | 2 +-
.../tracker-enums.h | 0
.../tracker-file-utils.c | 0
.../tracker-file-utils.h | 2 +-
.../tracker-ioprio.c | 0
.../tracker-ioprio.h | 2 +-
.../tracker-language.c | 0
.../tracker-language.h | 2 +-
.../tracker-locale.c | 0
.../tracker-locale.h | 2 +-
.../tracker-log.c | 0
.../tracker-log.h | 2 +-
.../tracker-miners-common.h} | 21 ++++-----
.../tracker-miners-enum-types.c.template} | 2 +-
.../tracker-miners-enum-types.h.template} | 0
.../tracker-sched.c | 0
.../tracker-sched.h | 2 +-
.../tracker-seccomp.c | 0
.../tracker-seccomp.h | 2 +-
.../tracker-type-utils.c | 0
.../tracker-type-utils.h | 2 +-
.../tracker-utils.c | 0
.../tracker-utils.h | 2 +-
src/meson.build | 4 +-
src/miners/apps/Makefile.am | 20 ++++----
src/miners/apps/meson.build | 2 +-
src/miners/apps/tracker-main.c | 2 +-
src/miners/apps/tracker-miner-applications.c | 2 +-
src/miners/fs/Makefile.am | 8 ++--
src/miners/fs/meson.build | 2 +-
src/miners/fs/tracker-config.c | 2 +-
src/miners/fs/tracker-extract-watchdog.c | 2 +-
src/miners/fs/tracker-main.c | 2 +-
src/miners/fs/tracker-miner-files-index.c | 2 +-
src/miners/fs/tracker-miner-files.c | 2 +-
src/miners/fs/tracker-power-hal.c | 4 +-
src/miners/fs/tracker-power.h | 2 +-
src/miners/fs/tracker-storage.c | 2 +-
src/miners/fs/tracker-thumbnailer.c | 2 +-
src/miners/fs/tracker-writeback-dispatcher.c | 2 +-
src/miners/fs/tracker-writeback-listener.c | 2 +-
src/miners/rss/Makefile.am | 20 ++++----
src/miners/rss/meson.build | 2 +-
src/miners/rss/tracker-main.c | 2 +-
src/miners/rss/tracker-miner-rss.c | 4 +-
src/tracker-extract/Makefile.am | 46 ++++++++++----------
src/tracker-extract/meson.build | 42 +++++++++---------
src/tracker-extract/tracker-config.c | 2 +-
src/tracker-extract/tracker-cue-sheet.c | 2 +-
src/tracker-extract/tracker-extract-abw.c | 2 +-
src/tracker-extract/tracker-extract-bmp.c | 2 +-
src/tracker-extract/tracker-extract-dummy.c | 2 +-
src/tracker-extract/tracker-extract-flac.c | 2 +-
src/tracker-extract/tracker-extract-gif.c | 2 +-
src/tracker-extract/tracker-extract-gstreamer.c | 2 +-
src/tracker-extract/tracker-extract-html.c | 2 +-
src/tracker-extract/tracker-extract-icon.c | 2 +-
src/tracker-extract/tracker-extract-jpeg.c | 2 +-
src/tracker-extract/tracker-extract-libav.c | 2 +-
src/tracker-extract/tracker-extract-mp3.c | 2 +-
src/tracker-extract/tracker-extract-msoffice.c | 2 +-
src/tracker-extract/tracker-extract-oasis.c | 2 +-
src/tracker-extract/tracker-extract-pdf.c | 6 +-
src/tracker-extract/tracker-extract-png.c | 4 +-
src/tracker-extract/tracker-extract-ps.c | 2 +-
src/tracker-extract/tracker-extract-text.c | 2 +-
src/tracker-extract/tracker-extract-tiff.c | 2 +-
src/tracker-extract/tracker-extract-vorbis.c | 2 +-
src/tracker-extract/tracker-extract-xmp.c | 2 +-
src/tracker-extract/tracker-extract.c | 2 +-
src/tracker-extract/tracker-extract.h | 2 +-
src/tracker-extract/tracker-gsf.c | 2 +-
src/tracker-extract/tracker-main.c | 2 +-
src/tracker-writeback/Makefile.am | 24 +++++-----
src/tracker-writeback/meson.build | 6 +-
src/tracker-writeback/tracker-config.c | 2 +-
src/tracker-writeback/tracker-main.c | 2 +-
src/tracker-writeback/tracker-writeback-file.c | 4 +-
src/tracker-writeback/tracker-writeback-xmp.c | 2 +-
src/tracker-writeback/tracker-writeback.c | 2 +-
tests/libtracker-extract/meson.build | 14 +++---
tests/libtracker-extract/tracker-encoding-test.c | 2 +-
.../.gitignore | 0
.../Makefile.am | 0
.../meson.build | 12 +++---
.../non-utf8.txt | 0
.../tracker-date-time-test.c | 2 +-
.../tracker-dbus-test.c | 2 +-
.../tracker-file-utils-test.c | 4 +-
.../tracker-sched-test.c | 2 +-
.../tracker-type-utils-test.c | 2 +-
.../tracker-utils-test.c | 6 +-
tests/meson.build | 2 +-
110 files changed, 226 insertions(+), 227 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 5578119..89e5b37 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = \
- libtracker-common \
+ libtracker-miners-common \
libtracker-extract \
miners
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index 642c662..683d83b 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -11,7 +11,7 @@ libtracker_extractdir = $(libdir)/tracker-miners-$(TRACKER_API_VERSION)
libtracker_extract_LTLIBRARIES = libtracker-extract.la
libtracker_extract_la_LIBADD = \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(LIBTRACKER_EXTRACT_LIBS)
diff --git a/src/libtracker-extract/meson.build b/src/libtracker-extract/meson.build
index 7dc59fa..7453875 100644
--- a/src/libtracker-extract/meson.build
+++ b/src/libtracker-extract/meson.build
@@ -32,7 +32,7 @@ endif
libtracker_extract = library('tracker-extract',
libtracker_extract_sources,
- dependencies: [tracker_common_dep] + tracker_extract_dependencies,
+ dependencies: [tracker_miners_common_dep] + tracker_extract_dependencies,
c_args: tracker_c_args + [
'-DTRACKER_EXTRACTOR_RULES_DIR="@0@"'.format(tracker_extract_rules_dir),
'-DTRACKER_EXTRACTORS_DIR="@0@"'.format(tracker_extract_modules_dir)
diff --git a/src/libtracker-extract/tracker-guarantee.c b/src/libtracker-extract/tracker-guarantee.c
index 841b663..63202f4 100644
--- a/src/libtracker-extract/tracker-guarantee.c
+++ b/src/libtracker-extract/tracker-guarantee.c
@@ -23,8 +23,8 @@
#include <glib.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-date-time.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-date-time.h>
#include "tracker-guarantee.h"
diff --git a/src/libtracker-extract/tracker-utils.c b/src/libtracker-extract/tracker-utils.c
index 500234c..69616c0 100644
--- a/src/libtracker-extract/tracker-utils.c
+++ b/src/libtracker-extract/tracker-utils.c
@@ -26,8 +26,8 @@
#include <string.h>
#include <stdio.h>
-#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-date-time.h>
+#include <libtracker-miners-common/tracker-utils.h>
+#include <libtracker-miners-common/tracker-date-time.h>
#include "tracker-utils.h"
diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
index 1b53754..d9bf907 100644
--- a/src/libtracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -21,7 +21,7 @@
#include <locale.h>
-#include <libtracker-common/tracker-utils.h>
+#include <libtracker-miners-common/tracker-utils.h>
#include "tracker-resource-helpers.h"
#include "tracker-xmp.h"
diff --git a/src/libtracker-common/.gitignore b/src/libtracker-miners-common/.gitignore
similarity index 100%
rename from src/libtracker-common/.gitignore
rename to src/libtracker-miners-common/.gitignore
diff --git a/src/libtracker-common/COPYING.LIB b/src/libtracker-miners-common/COPYING.LIB
similarity index 100%
rename from src/libtracker-common/COPYING.LIB
rename to src/libtracker-miners-common/COPYING.LIB
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-miners-common/Makefile.am
similarity index 86%
rename from src/libtracker-common/Makefile.am
rename to src/libtracker-miners-common/Makefile.am
index 762ea6a..4e7a761 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-miners-common/Makefile.am
@@ -4,10 +4,10 @@ AM_CPPFLAGS = \
-DSHAREDIR=\""$(datadir)"\" \
$(LIBTRACKER_COMMON_CFLAGS)
-libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
-noinst_LTLIBRARIES = libtracker-common.la
+libtracker_miners_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
+noinst_LTLIBRARIES = libtracker-miners-common.la
-libtracker_common_la_SOURCES = \
+libtracker_miners_common_la_SOURCES = \
$(BUILT_SOURCES) \
tracker-date-time.c \
tracker-dbus.c \
@@ -38,7 +38,7 @@ noinst_HEADERS = \
tracker-locale.h \
tracker-language.h
-libtracker_common_la_LIBADD = \
+libtracker_miners_common_la_LIBADD = \
$(BUILD_LIBS) \
$(LIBTRACKER_COMMON_LIBS) \
-lm
@@ -59,7 +59,7 @@ CLEANFILES = \
tracker-enum-types.h
EXTRA_DIST = \
- libtracker-common.vapi \
+ libtracker-miners-common.vapi \
tracker-enum-types.c.template \
tracker-enum-types.h.template \
meson.build
diff --git a/src/libtracker-common/libtracker-common.vapi
b/src/libtracker-miners-common/libtracker-common.vapi
similarity index 86%
rename from src/libtracker-common/libtracker-common.vapi
rename to src/libtracker-miners-common/libtracker-common.vapi
index 6f0a8e0..b850124 100644
--- a/src/libtracker-common/libtracker-common.vapi
+++ b/src/libtracker-miners-common/libtracker-common.vapi
@@ -20,16 +20,16 @@
[CCode (cprefix = "Tracker", gir_namespace = "Tracker",
gir_version = "1.0", lower_case_cprefix = "tracker_")]
namespace Tracker {
- [CCode (cheader_filename = "libtracker-common/tracker-date-time.h")]
+ [CCode (cheader_filename = "libtracker-miners-common/tracker-date-time.h")]
public double string_to_date (string date_string, out int offset) throws DateError;
- [CCode (cheader_filename = "libtracker-common/tracker-date-time.h")]
+ [CCode (cheader_filename = "libtracker-miners-common/tracker-date-time.h")]
public errordomain DateError {
OFFSET,
INVALID_ISO8601
}
- [CCode (cheader_filename = "libtracker-common/tracker-common.h")]
+ [CCode (cheader_filename = "libtracker-miners-common/tracker-common.h")]
public class ConfigFile : GLib.Object {
[CCode (has_construct_function = false)]
public ConfigFile ();
@@ -43,7 +43,7 @@ namespace Tracker {
public GLib.KeyFile key_file;
}
- [CCode (cheader_filename = "libtracker-common/tracker-common.h")]
+ [CCode (cheader_filename = "libtracker-miners-common/tracker-common.h")]
public class KeyfileObject {
public static string blurb (void *object, string property);
public static bool default_boolean (void *object, string property);
@@ -61,25 +61,25 @@ namespace Tracker {
public static void save_directory_list (void *object, string property, GLib.KeyFile key_file,
string group, string key);
}
- [CCode (cheader_filename = "libtracker-common/tracker-common.h")]
+ [CCode (cheader_filename = "libtracker-miners-common/tracker-common.h")]
namespace Log {
public bool init (int verbosity, out string used_filename);
public void shutdown ();
}
- [CCode (cheader_filename = "libtracker-common/tracker-locale.h")]
+ [CCode (cheader_filename = "libtracker-miners-common/tracker-locale.h")]
namespace Locale {
public void sanity_check ();
}
[Compact]
- [CCode (cheader_filename = "libtracker-common/tracker-common.h")]
+ [CCode (cheader_filename = "libtracker-miners-common/tracker-common.h")]
namespace IPC {
public GLib.BusType bus ();
}
[Compact]
- [CCode (ref_function = "", unref_function = "", cheader_filename =
"libtracker-common/tracker-common.h")]
+ [CCode (ref_function = "", unref_function = "", cheader_filename =
"libtracker-miners-common/tracker-common.h")]
public class DBusRequest {
public static DBusRequest begin (string? sender, string format,...);
public void debug (string format,...);
@@ -88,7 +88,7 @@ namespace Tracker {
public static void enable_client_lookup (bool enable);
}
- [CCode (cheader_filename = "libtracker-common/tracker-domain-ontology.h")]
+ [CCode (cheader_filename = "libtracker-miners-common/tracker-domain-ontology.h")]
public class DomainOntology : GLib.Object, GLib.Initable {
public DomainOntology (string? name, GLib.Cancellable? cancellable) throws GLib.Error;
public GLib.File get_cache ();
@@ -97,7 +97,7 @@ namespace Tracker {
public string get_domain (string? suffix = null);
}
- [CCode (cheader_filename = "libtracker-common/tracker-common.h")]
+ [CCode (cheader_filename = "libtracker-miners-common/tracker-common.h")]
public void ioprio_init ();
[CCode (cname = "g_message", cheader_filename = "glib.h")]
diff --git a/src/libtracker-common/meson.build b/src/libtracker-miners-common/meson.build
similarity index 58%
rename from src/libtracker-common/meson.build
rename to src/libtracker-miners-common/meson.build
index 999c7ff..9268e2b 100644
--- a/src/libtracker-common/meson.build
+++ b/src/libtracker-miners-common/meson.build
@@ -1,12 +1,12 @@
-enums = gnome.mkenums('tracker-enum-types',
+enums = gnome.mkenums('tracker-miners-enum-types',
sources: 'tracker-enums.h',
- c_template: 'tracker-enum-types.c.template',
- h_template: 'tracker-enum-types.h.template',
+ c_template: 'tracker-miners-enum-types.c.template',
+ h_template: 'tracker-miners-enum-types.h.template',
)
-tracker_common_enum_header = enums[1]
+tracker_miners_common_enum_header = enums[1]
-tracker_common_sources = [
+tracker_miners_common_sources = [
'tracker-date-time.c',
'tracker-dbus.c',
'tracker-domain-ontology.c',
@@ -23,17 +23,17 @@ tracker_common_sources = [
]
# FIXME: need to link against -lkvm on OpenBSD, see configure.ac
-tracker_common_dependencies = [glib, gio, gio_unix, libmath]
+tracker_miners_common_dependencies = [glib, gio, gio_unix, libmath]
-tracker_common_private_dependencies = [charset_library]
+tracker_miners_common_private_dependencies = [charset_library]
if libseccomp.found()
- tracker_common_private_dependencies += [libseccomp]
+ tracker_miners_common_private_dependencies += [libseccomp]
endif
-libtracker_common = library('tracker-common',
- tracker_common_sources,
- dependencies: tracker_common_dependencies + tracker_common_private_dependencies,
+libtracker_miners_common = library('tracker-miners-common',
+ tracker_miners_common_sources,
+ dependencies: tracker_miners_common_dependencies + tracker_miners_common_private_dependencies,
c_args: tracker_c_args,
include_directories: [configinc, srcinc],
install: true,
@@ -51,9 +51,9 @@ commoninc = include_directories('.')
# ninja: fatal: posix_spawn: Argument list too long
#
# Upstream issue: https://github.com/mesonbuild/meson/issues/671
-tracker_common_dep = declare_dependency(
- sources: [tracker_common_enum_header],
- link_with: libtracker_common,
- dependencies: tracker_common_dependencies,
+tracker_miners_common_dep = declare_dependency(
+ sources: [tracker_miners_common_enum_header],
+ link_with: libtracker_miners_common,
+ dependencies: tracker_miners_common_dependencies,
include_directories: [configinc, srcinc, commoninc],
)
diff --git a/src/libtracker-common/tracker-common.h b/src/libtracker-miners-common/tracker-common.h
similarity index 94%
rename from src/libtracker-common/tracker-common.h
rename to src/libtracker-miners-common/tracker-common.h
index de39a87..2e352dc 100644
--- a/src/libtracker-common/tracker-common.h
+++ b/src/libtracker-miners-common/tracker-common.h
@@ -21,7 +21,7 @@
#define __LIBTRACKER_COMMON_H__
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
#include <glib.h>
diff --git a/src/libtracker-common/tracker-date-time.c b/src/libtracker-miners-common/tracker-date-time.c
similarity index 100%
rename from src/libtracker-common/tracker-date-time.c
rename to src/libtracker-miners-common/tracker-date-time.c
diff --git a/src/libtracker-common/tracker-date-time.h b/src/libtracker-miners-common/tracker-date-time.h
similarity index 96%
rename from src/libtracker-common/tracker-date-time.h
rename to src/libtracker-miners-common/tracker-date-time.h
index 78b56eb..eece137 100644
--- a/src/libtracker-common/tracker-date-time.h
+++ b/src/libtracker-miners-common/tracker-date-time.h
@@ -27,7 +27,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
typedef enum {
diff --git a/src/libtracker-common/tracker-dbus.c b/src/libtracker-miners-common/tracker-dbus.c
similarity index 100%
rename from src/libtracker-common/tracker-dbus.c
rename to src/libtracker-miners-common/tracker-dbus.c
diff --git a/src/libtracker-common/tracker-dbus.h b/src/libtracker-miners-common/tracker-dbus.h
similarity index 97%
rename from src/libtracker-common/tracker-dbus.h
rename to src/libtracker-miners-common/tracker-dbus.h
index bfbff9b..8fa55f7 100644
--- a/src/libtracker-common/tracker-dbus.h
+++ b/src/libtracker-miners-common/tracker-dbus.h
@@ -25,7 +25,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
/* Allow bus type override by env var TRACKER_BUS_TYPE */
diff --git a/src/libtracker-common/tracker-domain-ontology.c
b/src/libtracker-miners-common/tracker-domain-ontology.c
similarity index 100%
rename from src/libtracker-common/tracker-domain-ontology.c
rename to src/libtracker-miners-common/tracker-domain-ontology.c
diff --git a/src/libtracker-common/tracker-domain-ontology.h
b/src/libtracker-miners-common/tracker-domain-ontology.h
similarity index 97%
rename from src/libtracker-common/tracker-domain-ontology.h
rename to src/libtracker-miners-common/tracker-domain-ontology.h
index befae10..567dab0 100644
--- a/src/libtracker-common/tracker-domain-ontology.h
+++ b/src/libtracker-miners-common/tracker-domain-ontology.h
@@ -23,7 +23,7 @@
#define __TRACKER_DOMAIN_ONTOLOGY_H__
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
#include <glib-object.h>
diff --git a/src/libtracker-common/tracker-enums.h b/src/libtracker-miners-common/tracker-enums.h
similarity index 100%
rename from src/libtracker-common/tracker-enums.h
rename to src/libtracker-miners-common/tracker-enums.h
diff --git a/src/libtracker-common/tracker-file-utils.c b/src/libtracker-miners-common/tracker-file-utils.c
similarity index 100%
rename from src/libtracker-common/tracker-file-utils.c
rename to src/libtracker-miners-common/tracker-file-utils.c
diff --git a/src/libtracker-common/tracker-file-utils.h b/src/libtracker-miners-common/tracker-file-utils.h
similarity index 97%
rename from src/libtracker-common/tracker-file-utils.h
rename to src/libtracker-miners-common/tracker-file-utils.h
index 2b6beab..80e6844 100644
--- a/src/libtracker-common/tracker-file-utils.h
+++ b/src/libtracker-miners-common/tracker-file-utils.h
@@ -28,7 +28,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
/* File utils */
diff --git a/src/libtracker-common/tracker-ioprio.c b/src/libtracker-miners-common/tracker-ioprio.c
similarity index 100%
rename from src/libtracker-common/tracker-ioprio.c
rename to src/libtracker-miners-common/tracker-ioprio.c
diff --git a/src/libtracker-common/tracker-ioprio.h b/src/libtracker-miners-common/tracker-ioprio.h
similarity index 93%
copy from src/libtracker-common/tracker-ioprio.h
copy to src/libtracker-miners-common/tracker-ioprio.h
index 86ef147..39e2e59 100644
--- a/src/libtracker-common/tracker-ioprio.h
+++ b/src/libtracker-miners-common/tracker-ioprio.h
@@ -26,7 +26,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
void tracker_ioprio_init (void);
diff --git a/src/libtracker-common/tracker-language.c b/src/libtracker-miners-common/tracker-language.c
similarity index 100%
rename from src/libtracker-common/tracker-language.c
rename to src/libtracker-miners-common/tracker-language.c
diff --git a/src/libtracker-common/tracker-language.h b/src/libtracker-miners-common/tracker-language.h
similarity index 97%
rename from src/libtracker-common/tracker-language.h
rename to src/libtracker-miners-common/tracker-language.h
index 71e00f1..68b0e2e 100644
--- a/src/libtracker-common/tracker-language.h
+++ b/src/libtracker-miners-common/tracker-language.h
@@ -26,7 +26,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
#define TRACKER_TYPE_LANGUAGE (tracker_language_get_type ())
diff --git a/src/libtracker-common/tracker-locale.c b/src/libtracker-miners-common/tracker-locale.c
similarity index 100%
rename from src/libtracker-common/tracker-locale.c
rename to src/libtracker-miners-common/tracker-locale.c
diff --git a/src/libtracker-common/tracker-locale.h b/src/libtracker-miners-common/tracker-locale.h
similarity index 94%
rename from src/libtracker-common/tracker-locale.h
rename to src/libtracker-miners-common/tracker-locale.h
index 32547d1..c42abec 100644
--- a/src/libtracker-common/tracker-locale.h
+++ b/src/libtracker-miners-common/tracker-locale.h
@@ -25,7 +25,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
/* Type of locales supported in tracker */
diff --git a/src/libtracker-common/tracker-log.c b/src/libtracker-miners-common/tracker-log.c
similarity index 100%
rename from src/libtracker-common/tracker-log.c
rename to src/libtracker-miners-common/tracker-log.c
diff --git a/src/libtracker-common/tracker-log.h b/src/libtracker-miners-common/tracker-log.h
similarity index 93%
rename from src/libtracker-common/tracker-log.h
rename to src/libtracker-miners-common/tracker-log.h
index 369d022..fe4b674 100644
--- a/src/libtracker-common/tracker-log.h
+++ b/src/libtracker-miners-common/tracker-log.h
@@ -25,7 +25,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
gboolean tracker_log_init (gint verbosity,
diff --git a/src/libtracker-common/tracker-ioprio.h b/src/libtracker-miners-common/tracker-miners-common.h
similarity index 67%
rename from src/libtracker-common/tracker-ioprio.h
rename to src/libtracker-miners-common/tracker-miners-common.h
index 86ef147..01a2ad1 100644
--- a/src/libtracker-common/tracker-ioprio.h
+++ b/src/libtracker-miners-common/tracker-miners-common.h
@@ -1,5 +1,4 @@
/*
- * Copyright (C) 2006, Anders Aagaard
* Copyright (C) 2008, Nokia <ivan frade nokia com>
*
* This library is free software; you can redistribute it and/or
@@ -18,19 +17,19 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKER_COMMON_IOPRIO_H__
-#define __LIBTRACKER_COMMON_IOPRIO_H__
+#ifndef __LIBTRACKER_MINERS_COMMON_H_
+#define __LIBTRACKER_MINERS_COMMON_H__
-#include <glib.h>
+#if !defined (__LIBTRACKER_MINERS_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
+#endif
-G_BEGIN_DECLS
+#include <glib.h>
-#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
-#endif
+#define __LIBTRACKER_MINERS_COMMON_INSIDE__
-void tracker_ioprio_init (void);
+#include "tracker-seccomp.h"
-G_END_DECLS
+#undef __LIBTRACKER_MINERS_COMMON_INSIDE__
-#endif /* __LIBTRACKER_COMMON_IOPRIO_H__ */
+#endif /* __LIBTRACKER_MINERS_COMMON_H__ */
diff --git a/src/libtracker-common/tracker-enum-types.c.template
b/src/libtracker-miners-common/tracker-miners-enum-types.c.template
similarity index 96%
rename from src/libtracker-common/tracker-enum-types.c.template
rename to src/libtracker-miners-common/tracker-miners-enum-types.c.template
index f71ace8..600b3a0 100644
--- a/src/libtracker-common/tracker-enum-types.c.template
+++ b/src/libtracker-miners-common/tracker-miners-enum-types.c.template
@@ -1,7 +1,7 @@
/*** BEGIN file-header ***/
#include <config.h>
-#include "tracker-enum-types.h"
+#include "tracker-miners-enum-types.h"
/*** END file-header ***/
diff --git a/src/libtracker-common/tracker-enum-types.h.template
b/src/libtracker-miners-common/tracker-miners-enum-types.h.template
similarity index 100%
rename from src/libtracker-common/tracker-enum-types.h.template
rename to src/libtracker-miners-common/tracker-miners-enum-types.h.template
diff --git a/src/libtracker-common/tracker-sched.c b/src/libtracker-miners-common/tracker-sched.c
similarity index 100%
rename from src/libtracker-common/tracker-sched.c
rename to src/libtracker-miners-common/tracker-sched.c
diff --git a/src/libtracker-common/tracker-sched.h b/src/libtracker-miners-common/tracker-sched.h
similarity index 92%
rename from src/libtracker-common/tracker-sched.h
rename to src/libtracker-miners-common/tracker-sched.h
index 7f9590e..e26e117 100644
--- a/src/libtracker-common/tracker-sched.h
+++ b/src/libtracker-miners-common/tracker-sched.h
@@ -25,7 +25,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
gboolean tracker_sched_idle (void);
diff --git a/src/libtracker-common/tracker-seccomp.c b/src/libtracker-miners-common/tracker-seccomp.c
similarity index 100%
rename from src/libtracker-common/tracker-seccomp.c
rename to src/libtracker-miners-common/tracker-seccomp.c
diff --git a/src/libtracker-common/tracker-seccomp.h b/src/libtracker-miners-common/tracker-seccomp.h
similarity index 92%
rename from src/libtracker-common/tracker-seccomp.h
rename to src/libtracker-miners-common/tracker-seccomp.h
index 0e03330..4cd3099 100644
--- a/src/libtracker-common/tracker-seccomp.h
+++ b/src/libtracker-miners-common/tracker-seccomp.h
@@ -25,7 +25,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
gboolean tracker_seccomp_init (void);
diff --git a/src/libtracker-common/tracker-type-utils.c b/src/libtracker-miners-common/tracker-type-utils.c
similarity index 100%
rename from src/libtracker-common/tracker-type-utils.c
rename to src/libtracker-miners-common/tracker-type-utils.c
diff --git a/src/libtracker-common/tracker-type-utils.h b/src/libtracker-miners-common/tracker-type-utils.h
similarity index 95%
rename from src/libtracker-common/tracker-type-utils.h
rename to src/libtracker-miners-common/tracker-type-utils.h
index e73142f..ed1c017 100644
--- a/src/libtracker-common/tracker-type-utils.h
+++ b/src/libtracker-miners-common/tracker-type-utils.h
@@ -26,7 +26,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
gint tracker_string_in_string_list (const gchar *str,
diff --git a/src/libtracker-common/tracker-utils.c b/src/libtracker-miners-common/tracker-utils.c
similarity index 100%
rename from src/libtracker-common/tracker-utils.c
rename to src/libtracker-miners-common/tracker-utils.c
diff --git a/src/libtracker-common/tracker-utils.h b/src/libtracker-miners-common/tracker-utils.h
similarity index 96%
rename from src/libtracker-common/tracker-utils.h
rename to src/libtracker-miners-common/tracker-utils.h
index 87ca7b3..9aa233f 100644
--- a/src/libtracker-common/tracker-utils.h
+++ b/src/libtracker-miners-common/tracker-utils.h
@@ -26,7 +26,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
gboolean tracker_is_empty_string (const char *str);
diff --git a/src/meson.build b/src/meson.build
index 8aeeae3..71efdd0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,5 +1,5 @@
# Shared common code
-subdir('libtracker-common')
+subdir('libtracker-miners-common')
# Internal data extraction helpers
subdir('libtracker-extract')
@@ -14,7 +14,7 @@ subdir('miners')
subdir('tracker-writeback')
custom_target('tracker-miners-settings-enums',
- input: 'libtracker-common/tracker-enums.h',
+ input: 'libtracker-miners-common/tracker-enums.h',
output: 'org.freedesktop.TrackerMiners.enums.xml',
command: [glib_mkenums,
'--comments', '<!-- @comment@ -->',
diff --git a/src/miners/apps/Makefile.am b/src/miners/apps/Makefile.am
index 9f6003b..01589b8 100644
--- a/src/miners/apps/Makefile.am
+++ b/src/miners/apps/Makefile.am
@@ -1,12 +1,12 @@
-AM_CPPFLAGS = \
- $(BUILD_CFLAGS) \
- -I$(top_srcdir)/src \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/src/libtracker-common/ \
- -I$(top_builddir)/src/libtracker-common/ \
- -DSHAREDIR=\""$(datadir)"\" \
- -DLOCALEDIR=\""$(localedir)"\" \
- -DLIBEXEC_PATH=\""$(libexecdir)"\" \
+AM_CPPFLAGS = \
+ $(BUILD_CFLAGS) \
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src/libtracker-miners-common/ \
+ -I$(top_builddir)/src/libtracker-miners-common/ \
+ -DSHAREDIR=\""$(datadir)"\" \
+ -DLOCALEDIR=\""$(localedir)"\" \
+ -DLIBEXEC_PATH=\""$(libexecdir)"\" \
$(TRACKER_MINER_APPS_CFLAGS)
libexec_PROGRAMS = tracker-miner-apps
@@ -17,7 +17,7 @@ tracker_miner_apps_SOURCES = \
tracker-miner-applications.h
tracker_miner_apps_LDADD = \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_MINER_APPS_LIBS)
diff --git a/src/miners/apps/meson.build b/src/miners/apps/meson.build
index 1ec46d5..ce58f5c 100644
--- a/src/miners/apps/meson.build
+++ b/src/miners/apps/meson.build
@@ -4,7 +4,7 @@ sources = [
]
executable('tracker-miner-apps', sources,
- dependencies: [tracker_miner, tracker_sparql, tracker_common_dep],
+ dependencies: [tracker_miner, tracker_sparql, tracker_miners_common_dep],
c_args: tracker_c_args,
install: true,
install_dir: get_option('libexecdir'),
diff --git a/src/miners/apps/tracker-main.c b/src/miners/apps/tracker-main.c
index 43f5f76..5828b91 100644
--- a/src/miners/apps/tracker-main.c
+++ b/src/miners/apps/tracker-main.c
@@ -28,7 +28,7 @@
#include <glib-object.h>
#include <glib/gi18n.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-miner/tracker-miner.h>
diff --git a/src/miners/apps/tracker-miner-applications.c b/src/miners/apps/tracker-miner-applications.c
index 4ee1c04..1400fbe 100644
--- a/src/miners/apps/tracker-miner-applications.c
+++ b/src/miners/apps/tracker-miner-applications.c
@@ -19,7 +19,7 @@
#include "config.h"
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include "tracker-miner-applications.h"
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index d9b0b9c..c8af610 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -2,8 +2,8 @@ AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
- -I$(top_srcdir)/src/libtracker-common \
- -I$(top_builddir)/src/libtracker-common \
+ -I$(top_srcdir)/src/libtracker-miners-common \
+ -I$(top_builddir)/src/libtracker-miners-common \
-DSHAREDIR=\""$(datadir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
-DLIBEXEC_PATH=\""$(libexecdir)"\" \
@@ -53,7 +53,7 @@ tracker_miner_fs_SOURCES = \
tracker_miner_fs_LDADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_MINER_FS_LIBS)
@@ -94,7 +94,7 @@ autostart_DATA = tracker-miner-fs.desktop
# Configuration / GSettings
gsettings_ENUM_NAMESPACE = org.freedesktop.TrackerMiners
-gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-miners-common/tracker-enums.h
gsettings_SCHEMAS = org.freedesktop.Tracker.Miner.Files.gschema.xml
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index 2ba122e..288610b 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -14,7 +14,7 @@ sources = [
tracker_miner_fs_deps = [
tracker_miner,
- tracker_common_dep,
+ tracker_miners_common_dep,
tracker_extract_dep
]
diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c
index 415b900..4619d08 100644
--- a/src/miners/fs/tracker-config.c
+++ b/src/miners/fs/tracker-config.c
@@ -29,7 +29,7 @@
#define G_SETTINGS_ENABLE_BACKEND
#include <gio/gsettingsbackend.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include "tracker-config.h"
diff --git a/src/miners/fs/tracker-extract-watchdog.c b/src/miners/fs/tracker-extract-watchdog.c
index 4c8acdd..38eac60 100644
--- a/src/miners/fs/tracker-extract-watchdog.c
+++ b/src/miners/fs/tracker-extract-watchdog.c
@@ -21,7 +21,7 @@
#include "tracker-extract-watchdog.h"
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-miner/tracker-miner.h>
struct _TrackerExtractWatchdog {
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index d655ae2..555db62 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -31,7 +31,7 @@
#include <glib-object.h>
#include <glib/gi18n.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-sparql/tracker-sparql.h>
#include <libtracker-miner/tracker-miner.h>
diff --git a/src/miners/fs/tracker-miner-files-index.c b/src/miners/fs/tracker-miner-files-index.c
index 5497c78..9a31e42 100644
--- a/src/miners/fs/tracker-miner-files-index.c
+++ b/src/miners/fs/tracker-miner-files-index.c
@@ -19,7 +19,7 @@
#include "config.h"
-#include <libtracker-common/tracker-dbus.h>
+#include <libtracker-miners-common/tracker-dbus.h>
#include <libtracker-sparql/tracker-sparql.h>
#include <libtracker-miner/tracker-miner.h>
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index c6e8a9f..107669e 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -34,7 +34,7 @@
#include <gio/gunixfdlist.h>
#include <gio/gunixinputstream.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-sparql/tracker-ontologies.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/miners/fs/tracker-power-hal.c b/src/miners/fs/tracker-power-hal.c
index c5e15ba..b2f7ac0 100644
--- a/src/miners/fs/tracker-power-hal.c
+++ b/src/miners/fs/tracker-power-hal.c
@@ -26,8 +26,8 @@
#include <libhal.h>
-#include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-utils.h>
+#include <libtracker-miners-common/tracker-log.h>
+#include <libtracker-miners-common/tracker-utils.h>
#include "tracker-power.h"
diff --git a/src/miners/fs/tracker-power.h b/src/miners/fs/tracker-power.h
index 7440b9e..bddaae0 100644
--- a/src/miners/fs/tracker-power.h
+++ b/src/miners/fs/tracker-power.h
@@ -25,7 +25,7 @@
G_BEGIN_DECLS
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
+#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
#define TRACKER_TYPE_POWER (tracker_power_get_type ())
diff --git a/src/miners/fs/tracker-storage.c b/src/miners/fs/tracker-storage.c
index 6114a6f..b7279a6 100644
--- a/src/miners/fs/tracker-storage.c
+++ b/src/miners/fs/tracker-storage.c
@@ -24,7 +24,7 @@
#include <gio/gio.h>
#include <gio/gunixmounts.h>
-#include <libtracker-common/tracker-log.h>
+#include <libtracker-miners-common/tracker-log.h>
#include "tracker-storage.h"
diff --git a/src/miners/fs/tracker-thumbnailer.c b/src/miners/fs/tracker-thumbnailer.c
index 6b678a4..7e3abc4 100644
--- a/src/miners/fs/tracker-thumbnailer.c
+++ b/src/miners/fs/tracker-thumbnailer.c
@@ -21,7 +21,7 @@
#include <string.h>
-#include <libtracker-common/tracker-dbus.h>
+#include <libtracker-miners-common/tracker-dbus.h>
#include "tracker-thumbnailer.h"
diff --git a/src/miners/fs/tracker-writeback-dispatcher.c b/src/miners/fs/tracker-writeback-dispatcher.c
index 980ccce..687a871 100644
--- a/src/miners/fs/tracker-writeback-dispatcher.c
+++ b/src/miners/fs/tracker-writeback-dispatcher.c
@@ -19,7 +19,7 @@
#include "config.h"
-#include <libtracker-common/tracker-dbus.h>
+#include <libtracker-miners-common/tracker-dbus.h>
#include <libtracker-sparql/tracker-sparql.h>
#include "tracker-writeback-dispatcher.h"
diff --git a/src/miners/fs/tracker-writeback-listener.c b/src/miners/fs/tracker-writeback-listener.c
index c861cae..c6e8973 100644
--- a/src/miners/fs/tracker-writeback-listener.c
+++ b/src/miners/fs/tracker-writeback-listener.c
@@ -19,7 +19,7 @@
#include "config.h"
-#include <libtracker-common/tracker-dbus.h>
+#include <libtracker-miners-common/tracker-dbus.h>
#include <libtracker-sparql/tracker-sparql.h>
#include "tracker-writeback-listener.h"
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index 80081cf..56c98d8 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -1,12 +1,12 @@
-AM_CPPFLAGS = \
- $(BUILD_CFLAGS) \
- -DSHAREDIR=\""$(datadir)"\" \
- -DLOCALEDIR=\""$(localedir)"\" \
- -DLIBEXEC_PATH=\""$(libexecdir)"\" \
- -I$(top_srcdir)/src \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/src/libtracker-common/ \
- -I$(top_builddir)/src/libtracker-common/ \
+AM_CPPFLAGS = \
+ $(BUILD_CFLAGS) \
+ -DSHAREDIR=\""$(datadir)"\" \
+ -DLOCALEDIR=\""$(localedir)"\" \
+ -DLIBEXEC_PATH=\""$(libexecdir)"\" \
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src/libtracker-miners-common/ \
+ -I$(top_builddir)/src/libtracker-miners-common/ \
$(TRACKER_MINER_RSS_CFLAGS)
libexec_PROGRAMS = tracker-miner-rss
@@ -17,7 +17,7 @@ tracker_miner_rss_SOURCES = \
tracker-miner-rss.c
tracker_miner_rss_LDADD = \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_MINER_RSS_LIBS)
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index 6d7e1ac..38949ec 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -4,7 +4,7 @@ sources = [
]
executable('tracker-miner-rss', sources,
- dependencies: [libgrss, tracker_miner, tracker_common_dep, tracker_extract_dep],
+ dependencies: [libgrss, tracker_miner, tracker_miners_common_dep, tracker_extract_dep],
c_args: tracker_c_args,
install: true,
install_dir: get_option('libexecdir'),
diff --git a/src/miners/rss/tracker-main.c b/src/miners/rss/tracker-main.c
index b11aadc..85f5346 100644
--- a/src/miners/rss/tracker-main.c
+++ b/src/miners/rss/tracker-main.c
@@ -25,7 +25,7 @@
#include <locale.h>
#include <glib/gi18n.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include "tracker-miner-rss.h"
diff --git a/src/miners/rss/tracker-miner-rss.c b/src/miners/rss/tracker-miner-rss.c
index 3d87052..cba5a1e 100644
--- a/src/miners/rss/tracker-miner-rss.c
+++ b/src/miners/rss/tracker-miner-rss.c
@@ -24,9 +24,9 @@
#include <libgrss.h>
-#include <libtracker-common/tracker-dbus.h>
+#include <libtracker-miners-common/tracker-dbus.h>
#include <libtracker-sparql/tracker-ontologies.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <glib/gi18n.h>
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 674223f..6ef555c 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -9,8 +9,8 @@ AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
- -I$(top_srcdir)/src/libtracker-common/ \
- -I$(top_builddir)/src/libtracker-common/ \
+ -I$(top_srcdir)/src/libtracker-miners-common/ \
+ -I$(top_builddir)/src/libtracker-miners-common/ \
-DLOCALEDIR=\""$(localedir)"\" \
-DTRACKER_EXTRACTORS_DIR=\""$(TRACKER_EXTRACT_MODULES_DIR)"\" \
$(TRACKER_EXTRACT_CFLAGS)
@@ -57,7 +57,7 @@ rules_files = \
91-gstreamer-generic-dlna.rule
# NOTE:
-# We don't always link with libtracker-common, we only link
+# We don't always link with libtracker-miners-common, we only link
# against it if we directly use functions in the .so
#
# _MODULES_DIR = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
@@ -194,7 +194,7 @@ libextract_abw_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
libextract_abw_la_LDFLAGS = $(module_flags)
libextract_abw_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS)
@@ -204,7 +204,7 @@ libextract_mp3_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
libextract_mp3_la_LDFLAGS = $(module_flags)
libextract_mp3_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS)
@@ -214,7 +214,7 @@ libextract_vorbis_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
libextract_vorbis_la_LDFLAGS = $(module_flags)
libextract_vorbis_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(LIBVORBIS_LIBS)
@@ -225,7 +225,7 @@ libextract_flac_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
libextract_flac_la_LDFLAGS = $(module_flags)
libextract_flac_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(LIBFLAC_LIBS)
@@ -238,7 +238,7 @@ libextract_oasis_la_CFLAGS = \
libextract_oasis_la_LDFLAGS = $(module_flags)
libextract_oasis_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(LIBGSF_LIBS)
@@ -251,7 +251,7 @@ libextract_epub_la_CFLAGS = \
libextract_epub_la_LDFLAGS = $(module_flags)
libextract_epub_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(LIBGSF_LIBS)
@@ -264,7 +264,7 @@ libextract_png_la_CFLAGS = \
libextract_png_la_LDFLAGS = $(module_flags)
libextract_png_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(LIBPNG_LIBS)
@@ -276,7 +276,7 @@ libextract_ps_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
libextract_ps_la_LDFLAGS = $(module_flags)
libextract_ps_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS)
@@ -309,7 +309,7 @@ libextract_msoffice_la_CFLAGS = \
libextract_msoffice_la_LDFLAGS = $(module_flags)
libextract_msoffice_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(LIBGSF_LIBS)
@@ -322,7 +322,7 @@ libextract_msoffice_xml_la_CFLAGS = \
libextract_msoffice_xml_la_LDFLAGS = $(module_flags)
libextract_msoffice_xml_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS)
@@ -334,7 +334,7 @@ libextract_xps_la_CFLAGS = \
libextract_xps_la_LDFLAGS = $(module_flags)
libextract_xps_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(LIBGXPS_LIBS)
@@ -347,7 +347,7 @@ libextract_pdf_la_CFLAGS = \
libextract_pdf_la_LDFLAGS = $(module_flags)
libextract_pdf_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(POPPLER_LIBS)
@@ -359,7 +359,7 @@ libextract_dvi_la_CFLAGS = \
libextract_dvi_la_LDFLAGS = $(module_flags)
libextract_dvi_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS)
@@ -400,7 +400,7 @@ libextract_gif_la_CFLAGS = \
libextract_gif_la_LDFLAGS = $(module_flags)
libextract_gif_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(LIBGIF_LIBS)
@@ -413,7 +413,7 @@ libextract_jpeg_la_CFLAGS = \
libextract_jpeg_la_LDFLAGS = $(module_flags)
libextract_jpeg_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(LIBJPEG_LIBS)
@@ -482,7 +482,7 @@ libextract_libav_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS) \
libextract_libav_la_LDFLAGS = $(module_flags)
libextract_libav_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS) \
$(AVFORMAT_LIBS) \
@@ -497,7 +497,7 @@ libextract_bmp_la_CFLAGS = \
libextract_bmp_la_LDFLAGS = $(module_flags)
libextract_bmp_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS)
@@ -508,7 +508,7 @@ libextract_dummy_la_CFLAGS = \
libextract_dummy_la_LDFLAGS = $(module_flags)
libextract_dummy_la_LIBADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_MODULES_LIBS)
@@ -534,7 +534,7 @@ tracker_extract_SOURCES = \
tracker_extract_LDADD = \
$(top_builddir)/src/libtracker-extract/libtracker-extract.la \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_EXTRACT_LIBS)
@@ -606,7 +606,7 @@ autostart_DATA = tracker-extract.desktop
# Configuration / GSettings
gsettings_ENUM_NAMESPACE = org.freedesktop.TrackerMiners
-gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-miners-common/tracker-enums.h
gsettings_SCHEMAS = org.freedesktop.Tracker.Extract.gschema.xml
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index 627b0ea..21626c0 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -5,37 +5,37 @@
# This might be nicer if Meson supported dictionary types.
modules = [
- ['extract-bmp', 'tracker-extract-bmp.c', '10-bmp.rule', [tracker_common_dep]],
- ['extract-dummy', 'tracker-extract-dummy.c', ['10-comics.rule', '10-ebooks.rule'], [tracker_common_dep]]
+ ['extract-bmp', 'tracker-extract-bmp.c', '10-bmp.rule', [tracker_miners_common_dep]],
+ ['extract-dummy', 'tracker-extract-dummy.c', ['10-comics.rule', '10-ebooks.rule'],
[tracker_miners_common_dep]]
]
if get_option('abiword')
- modules += [['extract-abw', 'tracker-extract-abw.c', '10-abw.rule', [tracker_common_dep]]]
+ modules += [['extract-abw', 'tracker-extract-abw.c', '10-abw.rule', [tracker_miners_common_dep]]]
endif
if get_option('dvi')
- modules += [['extract-dvi', 'tracker-extract-dvi.c', '10-dvi.rule', [tracker_common_dep]]]
+ modules += [['extract-dvi', 'tracker-extract-dvi.c', '10-dvi.rule', [tracker_miners_common_dep]]]
endif
if libgsf.found()
- modules += [['extract-epub', 'tracker-extract-epub.c', '10-epub.rule', [libgsf, tracker_common_dep]]]
- modules += [['extract-msoffice', 'tracker-extract-msoffice.c', '10-msoffice.rule', [libgsf,
tracker_common_dep]]]
- modules += [['extract-msoffice-xml', 'tracker-extract-msoffice-xml.c', '11-msoffice-xml.rule', [libgsf,
tracker_common_dep]]]
- modules += [['extract-oasis', 'tracker-extract-oasis.c', '10-oasis.rule', [libgsf, tracker_common_dep]]]
+ modules += [['extract-epub', 'tracker-extract-epub.c', '10-epub.rule', [libgsf,
tracker_miners_common_dep]]]
+ modules += [['extract-msoffice', 'tracker-extract-msoffice.c', '10-msoffice.rule', [libgsf,
tracker_miners_common_dep]]]
+ modules += [['extract-msoffice-xml', 'tracker-extract-msoffice-xml.c', '11-msoffice-xml.rule', [libgsf,
tracker_miners_common_dep]]]
+ modules += [['extract-oasis', 'tracker-extract-oasis.c', '10-oasis.rule', [libgsf,
tracker_miners_common_dep]]]
endif
if flac.found()
- modules += [['extract-flac', 'tracker-extract-flac.c', '10-flac.rule', [flac, tracker_common_dep]]]
+ modules += [['extract-flac', 'tracker-extract-flac.c', '10-flac.rule', [flac, tracker_miners_common_dep]]]
endif
if libgif.found()
- modules += [['extract-gif', 'tracker-extract-gif.c', '10-gif.rule', [libgif, tracker_common_dep]]]
+ modules += [['extract-gif', 'tracker-extract-gif.c', '10-gif.rule', [libgif, tracker_miners_common_dep]]]
endif
if generic_media_handler_name == 'gstreamer'
sources = ['tracker-extract-gstreamer.c', 'tracker-cue-sheet.c']
rules = ['10-svg.rule', '15-gstreamer-guess.rule', '90-gstreamer-image-generic.rule',
'90-gstreamer-audio-generic.rule', '90-gstreamer-video-generic.rule']
- dependencies = [gstreamer, gstreamer_pbutils, libcue, tracker_common_dep]
+ dependencies = [gstreamer, gstreamer_pbutils, libcue, tracker_miners_common_dep]
if gstreamer_backend_name == 'GUPnP-DNLA'
rules += '91-gstreamer-generic-dnla.rule'
@@ -52,12 +52,12 @@ if libxml2.found()
endif
if libjpeg.found()
- modules += [['extract-jpeg', 'tracker-extract-jpeg.c', '10-jpeg.rule', [libjpeg, tracker_common_dep]]]
+ modules += [['extract-jpeg', 'tracker-extract-jpeg.c', '10-jpeg.rule', [libjpeg,
tracker_miners_common_dep]]]
endif
if generic_media_handler_name == 'libav'
rules = ['90-libav-audio-generic.rule', '90-libav-video-generic.rule']
- dependencies = [avcodec, avformat, avutil, tracker_common_dep]
+ dependencies = [avcodec, avformat, avutil, tracker_miners_common_dep]
modules += [['extract-libav', 'tracker-extract-libav.c', rules, dependencies]]
endif
@@ -70,11 +70,11 @@ if libosinfo.found()
endif
if get_option('mp3')
- modules += [['extract-mp3', 'tracker-extract-mp3.c', '10-mp3.rule', [tracker_common_dep]]]
+ modules += [['extract-mp3', 'tracker-extract-mp3.c', '10-mp3.rule', [tracker_miners_common_dep]]]
endif
if poppler.found()
- modules += [['extract-pdf', 'tracker-extract-pdf.c', '10-pdf.rule', [poppler, tracker_common_dep]]]
+ modules += [['extract-pdf', 'tracker-extract-pdf.c', '10-pdf.rule', [poppler, tracker_miners_common_dep]]]
endif
if totem_plparser.found()
@@ -82,11 +82,11 @@ if totem_plparser.found()
endif
if libpng.found()
- modules += [['extract-png', 'tracker-extract-png.c', '10-png.rule', [libpng, tracker_common_dep]]]
+ modules += [['extract-png', 'tracker-extract-png.c', '10-png.rule', [libpng, tracker_miners_common_dep]]]
endif
if get_option('ps')
- modules += [['extract-ps', 'tracker-extract-ps.c', '10-ps.rule', [tracker_common_dep]]]
+ modules += [['extract-ps', 'tracker-extract-ps.c', '10-ps.rule', [tracker_miners_common_dep]]]
endif
if get_option('text')
@@ -94,11 +94,11 @@ if get_option('text')
endif
if libtiff.found()
- modules += [['extract-tiff', 'tracker-extract-tiff.c', '10-tiff.rule', [libtiff, tracker_common_dep]]]
+ modules += [['extract-tiff', 'tracker-extract-tiff.c', '10-tiff.rule', [libtiff,
tracker_miners_common_dep]]]
endif
if libvorbis.found()
- modules += [['extract-vorbis', 'tracker-extract-vorbis.c', '10-vorbis.rule', [libvorbis,
tracker_common_dep]]]
+ modules += [['extract-vorbis', 'tracker-extract-vorbis.c', '10-vorbis.rule', [libvorbis,
tracker_miners_common_dep]]]
endif
if exempi.found()
@@ -106,7 +106,7 @@ if exempi.found()
endif
if libgxps.found()
- modules += [['extract-xps', 'tracker-extract-xps.c', '10-xps.rule', [libgxps, tracker_common_dep]]]
+ modules += [['extract-xps', 'tracker-extract-xps.c', '10-xps.rule', [libgxps, tracker_miners_common_dep]]]
endif
@@ -144,7 +144,7 @@ tracker_extract_sources = [
]
tracker_extract_dependencies = [
- tracker_sparql, tracker_miner, tracker_common_dep, tracker_extract_dep
+ tracker_sparql, tracker_miner, tracker_miners_common_dep, tracker_extract_dep
]
if libgsf.found()
diff --git a/src/tracker-extract/tracker-config.c b/src/tracker-extract/tracker-config.c
index 7289255..20f6383 100644
--- a/src/tracker-extract/tracker-config.c
+++ b/src/tracker-extract/tracker-config.c
@@ -23,7 +23,7 @@
#define G_SETTINGS_ENABLE_BACKEND
#include <gio/gsettingsbackend.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include "tracker-config.h"
diff --git a/src/tracker-extract/tracker-cue-sheet.c b/src/tracker-extract/tracker-cue-sheet.c
index 39722d9..ca45b2f 100644
--- a/src/tracker-extract/tracker-cue-sheet.c
+++ b/src/tracker-extract/tracker-cue-sheet.c
@@ -35,7 +35,7 @@
#include <libcue/libcue.h>
#endif
-#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
#include "tracker-cue-sheet.h"
diff --git a/src/tracker-extract/tracker-extract-abw.c b/src/tracker-extract/tracker-extract-abw.c
index d8172af..5aefe91 100644
--- a/src/tracker-extract/tracker-extract-abw.c
+++ b/src/tracker-extract/tracker-extract-abw.c
@@ -31,7 +31,7 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-bmp.c b/src/tracker-extract/tracker-extract-bmp.c
index be7dc66..5fc2afb 100644
--- a/src/tracker-extract/tracker-extract-bmp.c
+++ b/src/tracker-extract/tracker-extract-bmp.c
@@ -21,7 +21,7 @@
#include "config.h"
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
static gboolean
diff --git a/src/tracker-extract/tracker-extract-dummy.c b/src/tracker-extract/tracker-extract-dummy.c
index 392c491..d934cbe 100644
--- a/src/tracker-extract/tracker-extract-dummy.c
+++ b/src/tracker-extract/tracker-extract-dummy.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
G_MODULE_EXPORT gboolean
diff --git a/src/tracker-extract/tracker-extract-flac.c b/src/tracker-extract/tracker-extract-flac.c
index c29b269..adcab3f 100644
--- a/src/tracker-extract/tracker-extract-flac.c
+++ b/src/tracker-extract/tracker-extract-flac.c
@@ -28,7 +28,7 @@
#include <FLAC/metadata.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c
index ecff110..58179bd 100644
--- a/src/tracker-extract/tracker-extract-gif.c
+++ b/src/tracker-extract/tracker-extract-gif.c
@@ -29,7 +29,7 @@
#include <gif_lib.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index c389a11..24d9a9c 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -50,7 +50,7 @@
#include <gst/gst.h>
#include <gst/tag/tag.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
#include "tracker-cue-sheet.h"
diff --git a/src/tracker-extract/tracker-extract-html.c b/src/tracker-extract/tracker-extract-html.c
index 58c2023..4ab58b4 100644
--- a/src/tracker-extract/tracker-extract-html.c
+++ b/src/tracker-extract/tracker-extract-html.c
@@ -25,7 +25,7 @@
#include <glib.h>
#include <libxml/HTMLparser.h>
-#include <libtracker-common/tracker-utils.h>
+#include <libtracker-miners-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
#include "tracker-main.h"
diff --git a/src/tracker-extract/tracker-extract-icon.c b/src/tracker-extract/tracker-extract-icon.c
index 69ed5fd..7eedcf6 100644
--- a/src/tracker-extract/tracker-extract-icon.c
+++ b/src/tracker-extract/tracker-extract-icon.c
@@ -19,7 +19,7 @@
#include "config.h"
-#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
#include <libtracker-extract/tracker-extract.h>
#define ICON_HEADER_SIZE_16 3
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index 00b3764..90ba07b 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -25,7 +25,7 @@
#include <jpeglib.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
#include <libtracker-sparql/tracker-sparql.h>
diff --git a/src/tracker-extract/tracker-extract-libav.c b/src/tracker-extract/tracker-extract-libav.c
index 142427b..6c786a1 100644
--- a/src/tracker-extract/tracker-extract-libav.c
+++ b/src/tracker-extract/tracker-extract-libav.c
@@ -22,7 +22,7 @@
#include <glib.h>
#include <libtracker-sparql/tracker-ontologies.h>
-#include <libtracker-common/tracker-utils.h>
+#include <libtracker-miners-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index c5d7265..0579ad5 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -36,7 +36,7 @@
#include <sys/mman.h>
#endif /* G_OS_WIN32 */
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-msoffice.c b/src/tracker-extract/tracker-extract-msoffice.c
index d2330c3..289dc98 100644
--- a/src/tracker-extract/tracker-extract-msoffice.c
+++ b/src/tracker-extract/tracker-extract-msoffice.c
@@ -34,7 +34,7 @@
#include <gsf/gsf-utils.h>
#include <gsf/gsf-infile-zip.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
#include "tracker-main.h"
diff --git a/src/tracker-extract/tracker-extract-oasis.c b/src/tracker-extract/tracker-extract-oasis.c
index 704dd2a..1dd977c 100644
--- a/src/tracker-extract/tracker-extract-oasis.c
+++ b/src/tracker-extract/tracker-extract-oasis.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index a89b94a..59669cc 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -40,9 +40,9 @@
#include <gio/gunixoutputstream.h>
#include <gio/gunixinputstream.h>
-#include <libtracker-common/tracker-date-time.h>
-#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-date-time.h>
+#include <libtracker-miners-common/tracker-utils.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 54d54ac..aa0928d 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -22,8 +22,8 @@
#include <png.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-date-time.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-date-time.h>
#include <libtracker-extract/tracker-extract.h>
#define RFC1123_DATE_FORMAT "%d %B %Y %H:%M:%S %z"
diff --git a/src/tracker-extract/tracker-extract-ps.c b/src/tracker-extract/tracker-extract-ps.c
index a8da27e..6d59e3d 100644
--- a/src/tracker-extract/tracker-extract-ps.c
+++ b/src/tracker-extract/tracker-extract-ps.c
@@ -29,7 +29,7 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
static gchar *
diff --git a/src/tracker-extract/tracker-extract-text.c b/src/tracker-extract/tracker-extract-text.c
index abcf403..5f94d73 100644
--- a/src/tracker-extract/tracker-extract-text.c
+++ b/src/tracker-extract/tracker-extract-text.c
@@ -32,7 +32,7 @@
#include <gio/gio.h>
-#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index 3c411c3..fc8a23f 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -30,7 +30,7 @@
#include <glib/gstdio.h>
#include <tiffio.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
#define CM_TO_INCH 0.393700787
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index d1d0840..1c743c4 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -28,7 +28,7 @@
#include <vorbis/vorbisfile.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-xmp.c b/src/tracker-extract/tracker-extract-xmp.c
index 44c035c..9101ad4 100644
--- a/src/tracker-extract/tracker-extract-xmp.c
+++ b/src/tracker-extract/tracker-extract-xmp.c
@@ -32,7 +32,7 @@
#include <gio/gio.h>
-#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index 699e6f3..8bf362f 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -30,7 +30,7 @@
#include <gio/gunixinputstream.h>
#include <gio/gunixfdlist.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract.h b/src/tracker-extract/tracker-extract.h
index 229be4c..06aae95 100644
--- a/src/tracker-extract/tracker-extract.h
+++ b/src/tracker-extract/tracker-extract.h
@@ -21,7 +21,7 @@
#define __TRACKERD_EXTRACT_H__
#include <gio/gio.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
#define TRACKER_EXTRACT_SERVICE "org.freedesktop.Tracker1.Extract"
diff --git a/src/tracker-extract/tracker-gsf.c b/src/tracker-extract/tracker-gsf.c
index 592a37b..ebe2735 100644
--- a/src/tracker-extract/tracker-gsf.c
+++ b/src/tracker-extract/tracker-gsf.c
@@ -22,7 +22,7 @@
#include <glib.h>
-#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
#include <gsf/gsf.h>
#include <gsf/gsf-infile.h>
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index 48db3b7..40f05d9 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -38,7 +38,7 @@
#include <sys/resource.h>
#endif
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include "tracker-config.h"
#include "tracker-main.h"
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index 116b9a6..e9e248e 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -1,16 +1,16 @@
module_flags = -module -avoid-version -no-undefined
modulesdir = $(libdir)/tracker-miners-$(TRACKER_API_VERSION)/writeback-modules
-AM_CPPFLAGS = \
- $(BUILD_CFLAGS) \
- -I$(top_srcdir)/src \
- -I$(top_builddir)/src \
- -I$(top_srcdir)/src/libtracker-common/ \
- -I$(top_builddir)/src/libtracker-common/ \
- -DLOCALEDIR=\""$(localedir)"\" \
- -DMODULESDIR=\"$(modulesdir)\" \
- -DWRITEBACK_MODULES_DIR=\""$(modulesdir)"\" \
- $(TRACKER_WRITEBACK_CFLAGS) \
+AM_CPPFLAGS = \
+ $(BUILD_CFLAGS) \
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src/libtracker-miners-common/ \
+ -I$(top_builddir)/src/libtracker-miners-common/ \
+ -DLOCALEDIR=\""$(localedir)"\" \
+ -DMODULESDIR=\"$(modulesdir)\" \
+ -DWRITEBACK_MODULES_DIR=\""$(modulesdir)"\" \
+ $(TRACKER_WRITEBACK_CFLAGS) \
$(LIBTRACKER_MINER_CFLAGS)
@@ -56,7 +56,7 @@ tracker_writeback_SOURCES = \
tracker-main.c
tracker_writeback_LDADD = \
- $(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-miners-common/libtracker-miners-common.la \
$(BUILD_LIBS) \
$(TRACKER_WRITEBACK_LIBS)
@@ -72,7 +72,7 @@ systemd_user_DATA = tracker-writeback.service
# Configuration / GSettings
gsettings_ENUM_NAMESPACE = org.freedesktop.TrackerMiners
-gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-miners-common/tracker-enums.h
gsettings_SCHEMAS = org.freedesktop.Tracker.Writeback.gschema.xml
diff --git a/src/tracker-writeback/meson.build b/src/tracker-writeback/meson.build
index cd32edd..37d88a7 100644
--- a/src/tracker-writeback/meson.build
+++ b/src/tracker-writeback/meson.build
@@ -7,11 +7,11 @@
modules = []
if taglib.found()
- modules += [['writeback-taglib', 'tracker-writeback-taglib.c', [tracker_miner, tracker_sparql,
tracker_common_dep, taglib]]]
+ modules += [['writeback-taglib', 'tracker-writeback-taglib.c', [tracker_miner, tracker_sparql,
tracker_miners_common_dep, taglib]]]
endif
if exempi.found()
- modules += [['writeback-xmp', 'tracker-writeback-xmp.c', [tracker_miner, tracker_sparql,
tracker_common_dep, exempi]]]
+ modules += [['writeback-xmp', 'tracker-writeback-xmp.c', [tracker_miner, tracker_sparql,
tracker_miners_common_dep, exempi]]]
endif
foreach module : modules
@@ -44,7 +44,7 @@ executable('tracker-writeback',
c_args: tracker_c_args + [
'-DWRITEBACK_MODULES_DIR="@0@"'.format(tracker_writeback_modules_dir),
],
- dependencies: [gmodule, tracker_miner, tracker_sparql, tracker_common_dep],
+ dependencies: [gmodule, tracker_miner, tracker_sparql, tracker_miners_common_dep],
install: true,
install_dir: join_paths(get_option('prefix'), get_option('libexecdir')))
diff --git a/src/tracker-writeback/tracker-config.c b/src/tracker-writeback/tracker-config.c
index dce8798..f1232fa 100644
--- a/src/tracker-writeback/tracker-config.c
+++ b/src/tracker-writeback/tracker-config.c
@@ -29,7 +29,7 @@
#define G_SETTINGS_ENABLE_BACKEND
#include <gio/gsettingsbackend.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include "tracker-config.h"
diff --git a/src/tracker-writeback/tracker-main.c b/src/tracker-writeback/tracker-main.c
index 2fb2be6..00a048b 100644
--- a/src/tracker-writeback/tracker-main.c
+++ b/src/tracker-writeback/tracker-main.c
@@ -24,7 +24,7 @@
#include <glib/gi18n.h>
-#include <libtracker-common/tracker-log.h>
+#include <libtracker-miners-common/tracker-log.h>
#include "tracker-writeback.h"
#include "tracker-config.h"
diff --git a/src/tracker-writeback/tracker-writeback-file.c b/src/tracker-writeback/tracker-writeback-file.c
index 60fc250..dba973b 100644
--- a/src/tracker-writeback/tracker-writeback-file.c
+++ b/src/tracker-writeback/tracker-writeback-file.c
@@ -24,8 +24,8 @@
#include <gio/gunixoutputstream.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-common.h>
#include "tracker-writeback-file.h"
diff --git a/src/tracker-writeback/tracker-writeback-xmp.c b/src/tracker-writeback/tracker-writeback-xmp.c
index 6da1315..3a50e77 100644
--- a/src/tracker-writeback/tracker-writeback-xmp.c
+++ b/src/tracker-writeback/tracker-writeback-xmp.c
@@ -31,7 +31,7 @@
#include <glib-object.h>
#include <gio/gio.h>
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-sparql/tracker-ontologies.h>
#include <libtracker-sparql/tracker-sparql.h>
diff --git a/src/tracker-writeback/tracker-writeback.c b/src/tracker-writeback/tracker-writeback.c
index 5bc2180..aeed1de 100644
--- a/src/tracker-writeback/tracker-writeback.c
+++ b/src/tracker-writeback/tracker-writeback.c
@@ -22,7 +22,7 @@
#include "tracker-writeback.h"
#include "tracker-writeback-module.h"
-#include <libtracker-common/tracker-common.h>
+#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-miner/tracker-miner.h>
#include <libtracker-sparql/tracker-sparql.h>
diff --git a/tests/libtracker-extract/meson.build b/tests/libtracker-extract/meson.build
index 6859510..c7ed217 100644
--- a/tests/libtracker-extract/meson.build
+++ b/tests/libtracker-extract/meson.build
@@ -5,28 +5,28 @@ test_c_args = tracker_c_args + [
guarantee_test = executable('tracker-guarantee-test',
'tracker-guarantee-test.c',
- dependencies: [tracker_common_dep, tracker_extract_dep],
+ dependencies: [tracker_miners_common_dep, tracker_extract_dep],
c_args: test_c_args,
)
test('extract-guarantee', guarantee_test)
extract_info_test = executable('tracker-extract-info-test',
'tracker-extract-info-test.c',
- dependencies: [tracker_common_dep, tracker_extract_dep],
+ dependencies: [tracker_miners_common_dep, tracker_extract_dep],
c_args: test_c_args,
)
test('extract-info-test', extract_info_test)
utils_test = executable('tracker-test-utils',
'tracker-test-utils.c',
- dependencies: [tracker_common_dep, tracker_extract_dep],
+ dependencies: [tracker_miners_common_dep, tracker_extract_dep],
c_args: test_c_args,
)
test('extract-utils', utils_test)
xmp_test = executable('tracker-test-xmp',
'tracker-test-xmp.c',
- dependencies: [tracker_common_dep, tracker_extract_dep],
+ dependencies: [tracker_miners_common_dep, tracker_extract_dep],
c_args: test_c_args,
)
test('extract-xmp', xmp_test)
@@ -34,7 +34,7 @@ test('extract-xmp', xmp_test)
if libexif.found()
exif_test = executable('tracker-exif-test',
'tracker-exif-test.c',
- dependencies: [tracker_common_dep, tracker_extract_dep],
+ dependencies: [tracker_miners_common_dep, tracker_extract_dep],
c_args: test_c_args,
)
test('extract-exif', exif_test)
@@ -43,7 +43,7 @@ endif
if libiptcdata.found() and libjpeg.found()
iptc_test = executable('tracker-iptc-test',
'tracker-iptc-test.c',
- dependencies: [tracker_common_dep, tracker_extract_dep, libjpeg],
+ dependencies: [tracker_miners_common_dep, tracker_extract_dep, libjpeg],
c_args: test_c_args,
)
test('extract-iptc', iptc_test)
@@ -52,7 +52,7 @@ endif
if charset_library_name != 'none'
encoding_test = executable('tracker-encoding-test',
'tracker-encoding-test.c',
- dependencies: [tracker_common_dep, tracker_extract_dep],
+ dependencies: [tracker_miners_common_dep, tracker_extract_dep],
c_args: test_c_args,
)
test('extract-encoding', encoding_test)
diff --git a/tests/libtracker-extract/tracker-encoding-test.c
b/tests/libtracker-extract/tracker-encoding-test.c
index cd14088..a878459 100644
--- a/tests/libtracker-extract/tracker-encoding-test.c
+++ b/tests/libtracker-extract/tracker-encoding-test.c
@@ -22,7 +22,7 @@
#include <glib-object.h>
#include <libtracker-extract/tracker-encoding.h>
-#include <libtracker-common/tracker-locale.h>
+#include <libtracker-miners-common/tracker-locale.h>
#include <locale.h>
static void
diff --git a/tests/libtracker-common/.gitignore b/tests/libtracker-miners-common/.gitignore
similarity index 100%
rename from tests/libtracker-common/.gitignore
rename to tests/libtracker-miners-common/.gitignore
diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-miners-common/Makefile.am
similarity index 100%
rename from tests/libtracker-common/Makefile.am
rename to tests/libtracker-miners-common/Makefile.am
diff --git a/tests/libtracker-common/meson.build b/tests/libtracker-miners-common/meson.build
similarity index 74%
rename from tests/libtracker-common/meson.build
rename to tests/libtracker-miners-common/meson.build
index 9246445..f5b9d3e 100644
--- a/tests/libtracker-common/meson.build
+++ b/tests/libtracker-miners-common/meson.build
@@ -5,42 +5,42 @@ test_c_args = tracker_c_args + [
date_time_test = executable('tracker-date-time-test',
'tracker-date-time-test.c',
- dependencies: tracker_common_dep,
+ dependencies: tracker_miners_common_dep,
c_args: test_c_args,
)
test('common-date-time', date_time_test)
dbus_test = executable('tracker-dbus-test',
'tracker-dbus-test.c',
- dependencies: [tracker_common_dep, tracker_testcommon_dep],
+ dependencies: [tracker_miners_common_dep, tracker_testcommon_dep],
c_args: test_c_args,
)
test('common-dbus', dbus_test)
file_utils_test = executable('tracker-file-utils-test',
'tracker-file-utils-test.c',
- dependencies: [tracker_common_dep, tracker_testcommon_dep],
+ dependencies: [tracker_miners_common_dep, tracker_testcommon_dep],
c_args: test_c_args,
)
test('common-file-utils', file_utils_test)
sched_test = executable('tracker-sched-test',
'tracker-sched-test.c',
- dependencies: [tracker_common_dep, tracker_testcommon_dep],
+ dependencies: [tracker_miners_common_dep, tracker_testcommon_dep],
c_args: test_c_args,
)
test('common-sched', sched_test)
type_utils_test = executable('tracker-type-utils-test',
'tracker-type-utils-test.c',
- dependencies: tracker_common_dep,
+ dependencies: tracker_miners_common_dep,
c_args: test_c_args,
)
test('common-type-utils', type_utils_test)
utils_test = executable('tracker-utils-test',
'tracker-utils-test.c',
- dependencies: tracker_common_dep,
+ dependencies: tracker_miners_common_dep,
c_args: test_c_args,
)
test('common-utils', utils_test)
diff --git a/tests/libtracker-common/non-utf8.txt b/tests/libtracker-miners-common/non-utf8.txt
similarity index 100%
rename from tests/libtracker-common/non-utf8.txt
rename to tests/libtracker-miners-common/non-utf8.txt
diff --git a/tests/libtracker-common/tracker-date-time-test.c
b/tests/libtracker-miners-common/tracker-date-time-test.c
similarity index 99%
rename from tests/libtracker-common/tracker-date-time-test.c
rename to tests/libtracker-miners-common/tracker-date-time-test.c
index 40e141f..f7c3222 100644
--- a/tests/libtracker-common/tracker-date-time-test.c
+++ b/tests/libtracker-miners-common/tracker-date-time-test.c
@@ -23,7 +23,7 @@
#include <glib.h>
#include <glib-object.h>
-#include <libtracker-common/tracker-date-time.h>
+#include <libtracker-miners-common/tracker-date-time.h>
/* This define was committed in glib 18.07.2011
* https://bugzilla.gnome.org/show_bug.cgi?id=577231
diff --git a/tests/libtracker-common/tracker-dbus-test.c b/tests/libtracker-miners-common/tracker-dbus-test.c
similarity index 99%
rename from tests/libtracker-common/tracker-dbus-test.c
rename to tests/libtracker-miners-common/tracker-dbus-test.c
index e9f2535..e1d884d 100644
--- a/tests/libtracker-common/tracker-dbus-test.c
+++ b/tests/libtracker-miners-common/tracker-dbus-test.c
@@ -22,7 +22,7 @@
#include <glib.h>
#include <gio/gio.h>
-#include <libtracker-common/tracker-dbus.h>
+#include <libtracker-miners-common/tracker-dbus.h>
#include <tracker-test-helpers.h>
diff --git a/tests/libtracker-common/tracker-file-utils-test.c
b/tests/libtracker-miners-common/tracker-file-utils-test.c
similarity index 99%
rename from tests/libtracker-common/tracker-file-utils-test.c
rename to tests/libtracker-miners-common/tracker-file-utils-test.c
index a7722ba..93b9447 100644
--- a/tests/libtracker-common/tracker-file-utils-test.c
+++ b/tests/libtracker-miners-common/tracker-file-utils-test.c
@@ -27,8 +27,8 @@
#include <glib/gstdio.h>
#include <gio/gio.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-locale.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-locale.h>
#include <tracker-test-helpers.h>
diff --git a/tests/libtracker-common/tracker-sched-test.c
b/tests/libtracker-miners-common/tracker-sched-test.c
similarity index 96%
rename from tests/libtracker-common/tracker-sched-test.c
rename to tests/libtracker-miners-common/tracker-sched-test.c
index 48bb21d..6712047 100644
--- a/tests/libtracker-common/tracker-sched-test.c
+++ b/tests/libtracker-miners-common/tracker-sched-test.c
@@ -20,7 +20,7 @@
#include <glib.h>
#include <glib-object.h>
-#include <libtracker-common/tracker-sched.h>
+#include <libtracker-miners-common/tracker-sched.h>
#ifdef __linux__
#include <linux/sched.h>
diff --git a/tests/libtracker-common/tracker-type-utils-test.c
b/tests/libtracker-miners-common/tracker-type-utils-test.c
similarity index 99%
rename from tests/libtracker-common/tracker-type-utils-test.c
rename to tests/libtracker-miners-common/tracker-type-utils-test.c
index 808c780..31ecbec 100644
--- a/tests/libtracker-common/tracker-type-utils-test.c
+++ b/tests/libtracker-miners-common/tracker-type-utils-test.c
@@ -22,7 +22,7 @@
#include <glib-object.h>
-#include <libtracker-common/tracker-type-utils.h>
+#include <libtracker-miners-common/tracker-type-utils.h>
static void
test_string_in_string_list_failures_subprocess (void)
diff --git a/tests/libtracker-common/tracker-utils-test.c
b/tests/libtracker-miners-common/tracker-utils-test.c
similarity index 96%
rename from tests/libtracker-common/tracker-utils-test.c
rename to tests/libtracker-miners-common/tracker-utils-test.c
index 8025af8..c2ee98f 100644
--- a/tests/libtracker-common/tracker-utils-test.c
+++ b/tests/libtracker-miners-common/tracker-utils-test.c
@@ -21,9 +21,9 @@
#include "config.h"
#include <glib-object.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-locale.h>
+#include <libtracker-miners-common/tracker-file-utils.h>
+#include <libtracker-miners-common/tracker-utils.h>
+#include <libtracker-miners-common/tracker-locale.h>
#include <locale.h>
static void
diff --git a/tests/meson.build b/tests/meson.build
index 632a9ca..5a7b060 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,6 +1,6 @@
subdir('common')
-subdir('libtracker-common')
+subdir('libtracker-miners-common')
if enable_extract
subdir('libtracker-extract')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
