Commit 3cee7b92 authored by Sam Thursfield's avatar Sam Thursfield Committed by Sam Thursfield

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.

https://bugzilla.gnome.org/show_bug.cgi?id=789725
parent 88196240
......@@ -1774,7 +1774,7 @@ AC_CONFIG_FILES([
docs/manpages/Makefile
Makefile
po/Makefile.in
src/libtracker-common/Makefile
src/libtracker-miners-common/Makefile
src/libtracker-extract/Makefile
src/Makefile
src/miners/Makefile
......@@ -1784,7 +1784,7 @@ AC_CONFIG_FILES([
src/tracker-extract/Makefile
src/tracker-writeback/Makefile
tests/common/Makefile
tests/libtracker-common/Makefile
tests/libtracker-miners-common/Makefile
tests/libtracker-extract/Makefile
tests/functional-tests/Makefile
tests/functional-tests/common/Makefile
......
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
[encoding: UTF-8]
src/libtracker-common/tracker-dbus.c
src/libtracker-common/tracker-utils.c
src/libtracker-miners-common/tracker-dbus.c
src/libtracker-miners-common/tracker-utils.c
src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
src/miners/apps/tracker-main.c
src/miners/apps/tracker-miner-apps.desktop.in.in
......
SUBDIRS = \
libtracker-common \
libtracker-miners-common \
libtracker-extract \
miners
......
......@@ -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)
......
......@@ -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)
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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,28 +38,28 @@ noinst_HEADERS = \
tracker-locale.h \
tracker-language.h
libtracker_common_la_LIBADD = \
libtracker_miners_common_la_LIBADD = \
$(BUILD_LIBS) \
$(LIBTRACKER_COMMON_LIBS) \
-lm
tracker-enum-types.h: tracker-enum-types.h.template tracker-enums.h
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template tracker-enum-types.h.template $(noinst_HEADERS)) > $@
tracker-miners-enum-types.h: tracker-miners-enum-types.h.template tracker-enums.h
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template tracker-miners-enum-types.h.template $(noinst_HEADERS)) > $@
tracker-enum-types.c: tracker-enum-types.c.template tracker-enums.h
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template tracker-enum-types.c.template $(noinst_HEADERS)) > $@
tracker-miners-enum-types.c: tracker-miners-enum-types.c.template tracker-enums.h
$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template tracker-miners-enum-types.c.template $(noinst_HEADERS)) > $@
BUILT_SOURCES = \
tracker-enum-types.c \
tracker-enum-types.h
tracker-miners-enum-types.c \
tracker-miners-enum-types.h
CLEANFILES = \
tracker-enum-types.c \
tracker-enum-types.h
tracker-miners-enum-types.c \
tracker-miners-enum-types.h
EXTRA_DIST = \
libtracker-common.vapi \
tracker-enum-types.c.template \
tracker-enum-types.h.template \
libtracker-miners-common.vapi \
tracker-miners-enum-types.c.template \
tracker-miners-enum-types.h.template \
meson.build
......@@ -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")]
......
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],
)
......@@ -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-miners-common.h> must be included directly."
#endif
#include <glib.h>
......@@ -40,7 +40,7 @@
#include "tracker-type-utils.h"
#include "tracker-utils.h"
#include "tracker-locale.h"
#include "tracker-enum-types.h"
#include "tracker-miners-enum-types.h"
#undef __LIBTRACKER_COMMON_INSIDE__
......
......@@ -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 {
......
......@@ -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 */
......
......@@ -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>
......
......@@ -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 */
......
......@@ -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);
......
......@@ -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 ())
......
......@@ -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 */
......
......@@ -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,
......
/*
* Copyright (C) 2008, Nokia <ivan.frade@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __LIBTRACKER_MINERS_COMMON_H_
#define __LIBTRACKER_MINERS_COMMON_H__
#if !defined (__LIBTRACKER_MINERS_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
#error "only <libtracker-miners-common/tracker-common.h> must be included directly."
#endif
#include <glib.h>
#define __LIBTRACKER_MINERS_COMMON_INSIDE__
#include "tracker-seccomp.h"
#undef __LIBTRACKER_MINERS_COMMON_INSIDE__
#endif /* __LIBTRACKER_MINERS_COMMON_H__ */
/*** BEGIN file-header ***/
#include <config.h>
#include "tracker-enum-types.h"
#include "tracker-miners-enum-types.h"
/*** END file-header ***/
......
......@@ -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);
......
......@@ -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);
......
......@@ -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,
......
......@@ -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);
......
# 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@ -->',
......
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)
......
......@@ -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'),
......
......@@ -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>
......
......@@ -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"
......
......@@ -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
......
......@@ -14,7 +14,7 @@ sources = [
tracker_miner_fs_deps = [
tracker_miner,
tracker_common_dep,
tracker_miners_common_dep,
tracker_extract_dep
]
......
......@@ -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"
......
......@@ -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 {
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -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 ())
......
......@@ -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"
......
......@@ -21,7 +21,7 @@
#include <string.h>
#include <libtracker-common/tracker-dbus.h>
#include <libtracker-miners-common/tracker-dbus.h>
#include "tracker-thumbnailer.h"
......
......@@ -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"
......