[tracker/gdbus: 89/101] libtracker-common, miner-fs: Move tracker-power-* to miner-fs

[Jürg Billeter <juergbi src gnome org>]

commit a17a7a6b89cb00363cf56c42e70206b0ea1ff5d8
Author: Philip Van Hoof <philip codeminded be>
Date:   Fri Jan 14 15:39:00 2011 +0100

    libtracker-common, miner-fs: Move tracker-power-* to miner-fs

 src/libtracker-common/Makefile.am                  |   17 -----------------
 src/libtracker-common/tracker-common.h             |    1 -
 src/miners/fs/Makefile.am                          |   17 +++++++++++++++++
 src/miners/fs/tracker-miner-files.c                |    2 +-
 .../fs}/tracker-power-hal.c                        |    7 ++++---
 .../fs}/tracker-power-upower.c                     |    0
 .../fs}/tracker-power.h                            |    0
 7 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index b230a58..df33113 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -15,25 +15,9 @@ else
 os_sources = tracker-os-dependant-unix.c
 endif
 
-# Prefer UPower for the power data if it's available, else fall back to HAL
-if HAVE_UPOWER
-power_headers =                                        \
-	tracker-power.h
-power_sources =                                        \
-	tracker-power-upower.c
-else
-if HAVE_HAL
-power_headers =                                        \
-	tracker-power.h
-power_sources =                                        \
-	tracker-power-hal.c
-endif
-endif
-
 libtracker_common_la_SOURCES =                         \
 	$(marshal_sources)                             \
 	$(os_sources)                                  \
-	$(power_sources)                               \
 	tracker-config-file.c                          \
 	tracker-date-time.c                            \
 	tracker-dbus.c                                 \
@@ -47,7 +31,6 @@ libtracker_common_la_SOURCES =                         \
 	tracker-locale.c
 
 noinst_HEADERS =                                       \
-	$(power_headers)                               \
 	tracker-dbus.h                                 \
 	tracker-ioprio.h                               \
 	tracker-log.h                                  \
diff --git a/src/libtracker-common/tracker-common.h b/src/libtracker-common/tracker-common.h
index 7fcfc72..bcf4e98 100644
--- a/src/libtracker-common/tracker-common.h
+++ b/src/libtracker-common/tracker-common.h
@@ -38,7 +38,6 @@
 #include "tracker-log.h"
 #include "tracker-ontologies.h"
 #include "tracker-os-dependant.h"
-#include "tracker-power.h"
 #include "tracker-type-utils.h"
 #include "tracker-utils.h"
 #include "tracker-locale.h"
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 160cf13..bdb6ecc 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -11,7 +11,24 @@ AM_CPPFLAGS =                                          \
 
 libexec_PROGRAMS = tracker-miner-fs
 
+# Prefer UPower for the power data if it's available, else fall back to HAL
+if HAVE_UPOWER
+power_headers =                                        \
+	tracker-power.h
+power_sources =                                        \
+	tracker-power-upower.c
+else
+if HAVE_HAL
+power_headers =                                        \
+	tracker-power.h
+power_sources =                                        \
+	tracker-power-hal.c
+endif
+endif
+
 tracker_miner_fs_SOURCES =                             \
+	$(power_sources)                               \
+	$(power_headers)                               \
 	tracker-config.c                               \
 	tracker-config.h                               \
 	tracker-main.c                                 \
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index c634bb4..82cf1a5 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -36,13 +36,13 @@
 
 #include <libtracker-common/tracker-date-time.h>
 #include <libtracker-common/tracker-ontologies.h>
-#include <libtracker-common/tracker-power.h>
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-file-utils.h>
 
 #include <libtracker-data/tracker-db-manager.h>
 
+#include "tracker-power.h"
 #include "tracker-miner-files.h"
 #include "tracker-config.h"
 #include "tracker-marshal.h"
diff --git a/src/libtracker-common/tracker-power-hal.c b/src/miners/fs/tracker-power-hal.c
similarity index 99%
rename from src/libtracker-common/tracker-power-hal.c
rename to src/miners/fs/tracker-power-hal.c
index fcd4375..b943552 100644
--- a/src/libtracker-common/tracker-power-hal.c
+++ b/src/miners/fs/tracker-power-hal.c
@@ -28,10 +28,11 @@
 
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "tracker-log.h"
+#include <libtracker-common/tracker-log.h>
+#include <libtracker-common/tracker-utils.h>
+#include <libtracker-common/tracker-marshal.h>
+
 #include "tracker-power.h"
-#include "tracker-utils.h"
-#include "tracker-marshal.h"
 
 #define CAPABILITY_AC_ADAPTER  "ac_adapter"
 #define CAPABILITY_BATTERY     "battery"
diff --git a/src/libtracker-common/tracker-power-upower.c b/src/miners/fs/tracker-power-upower.c
similarity index 100%
rename from src/libtracker-common/tracker-power-upower.c
rename to src/miners/fs/tracker-power-upower.c
diff --git a/src/libtracker-common/tracker-power.h b/src/miners/fs/tracker-power.h
similarity index 100%
rename from src/libtracker-common/tracker-power.h
rename to src/miners/fs/tracker-power.h