[tracker] Move fs/rss miners to src/miners.

From: Carlos Garnacho <carlosg src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker] Move fs/rss miners to src/miners.
Date: Thu, 25 Mar 2010 15:29:14 +0000 (UTC)
commit 37130a35749660b8137b30011d5d0ab356fc9790
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Mar 25 12:18:33 2010 +0100

    Move fs/rss miners to src/miners.
    
    The number of miners is likely to grow, so it's better to keep them
    tidy in their own subdir.

 configure.ac                                       |    5 +++--
 po/POTFILES.in                                     |    8 ++++----
 src/Makefile.am                                    |    6 +-----
 src/{tracker-miner-fs => miners/fs}/.gitignore     |    0
 src/{tracker-miner-fs => miners/fs}/Makefile.am    |    0
 .../fs}/tracker-config.c                           |    0
 .../fs}/tracker-config.h                           |    0
 src/{tracker-miner-fs => miners/fs}/tracker-dbus.c |    0
 src/{tracker-miner-fs => miners/fs}/tracker-dbus.h |    0
 src/{tracker-miner-fs => miners/fs}/tracker-main.c |    0
 .../fs}/tracker-marshal.list                       |    0
 .../fs}/tracker-miner-applications.c               |    0
 .../fs}/tracker-miner-applications.h               |    0
 .../fs}/tracker-miner-files-reindex.c              |    0
 .../fs}/tracker-miner-files-reindex.h              |    2 +-
 .../fs}/tracker-miner-files.c                      |    0
 .../fs}/tracker-miner-files.h                      |    0
 .../fs}/tracker-volume-cleanup.c                   |    0
 .../fs}/tracker-volume-cleanup.h                   |    0
 src/{tracker-miner-rss => miners/rss}/Makefile.am  |    0
 .../rss}/tracker-main.c                            |    0
 .../rss}/tracker-miner-rss.c                       |    0
 .../rss}/tracker-miner-rss.h                       |    0
 src/tracker-preferences/Makefile.am                |    4 ++--
 src/tracker-preferences/tracker-config.vapi        |    2 +-
 tests/tracker-miner-fs/Makefile.am                 |    6 +++---
 26 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 05d6d9c..10e8729 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1676,13 +1676,14 @@ AC_CONFIG_FILES([
 	src/libtracker-client/Makefile
 	src/libtracker-miner/Makefile
 	src/Makefile
+	src/miners/Makefile
+	src/miners/fs/Makefile
+	src/miners/rss/Makefile
 	src/tracker-status-icon/Makefile
 	src/tracker-status-icon/tracker-status-icon.desktop.in
 	src/tracker-store/Makefile
 	src/tracker-control/Makefile
 	src/tracker-extract/Makefile
-	src/tracker-miner-fs/Makefile
-	src/tracker-miner-rss/Makefile
 	src/tracker-preferences/Makefile
 	src/tracker-preferences/tracker-preferences.desktop.in
 	src/tracker-search-bar/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 15fc68f..e700ff6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,10 +24,10 @@ src/plugins/evolution/tracker-miner-emails.desktop.in
 [type: gettext/glade]src/tracker-explorer/tracker-explorer.ui
 src/tracker-extract/tracker-extract.c
 src/tracker-extract/tracker-main.c
-src/tracker-miner-fs/tracker-main.c
-src/tracker-miner-fs/tracker-miner-files.c
-src/tracker-miner-rss/tracker-main.c
-src/tracker-miner-rss/tracker-miner-rss.c
+src/miners/fs/tracker-main.c
+src/miners/fs/tracker-miner-files.c
+src/miners/rss/tracker-main.c
+src/miners/rss/tracker-miner-rss.c
 src/tracker-preferences/tracker-preferences.desktop.in.in
 src/tracker-preferences/tracker-preferences.vala
 [type: gettext/glade]src/tracker-preferences/tracker-preferences.ui
diff --git a/src/Makefile.am b/src/Makefile.am
index bbc1d09..cc018d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,12 +14,12 @@ SUBDIRS = 					\
 	libtracker-data				\
 	libtracker-extract			\
 	libtracker-miner			\
+	miners					\
 	plugins					\
 	tracker-store				\
 	tracker-control				\
 	tracker-utils				\
 	tracker-extract				\
-	tracker-miner-fs			\
 	tracker-writeback			\
 	vapi
 
@@ -42,7 +42,3 @@ endif
 if HAVE_TRACKER_EXPLORER
 SUBDIRS += tracker-explorer
 endif
-
-if USING_MINER_RSS
-SUBDIRS += tracker-miner-rss
-endif
diff --git a/src/tracker-miner-fs/.gitignore b/src/miners/fs/.gitignore
similarity index 100%
rename from src/tracker-miner-fs/.gitignore
rename to src/miners/fs/.gitignore
diff --git a/src/tracker-miner-fs/Makefile.am b/src/miners/fs/Makefile.am
similarity index 100%
rename from src/tracker-miner-fs/Makefile.am
rename to src/miners/fs/Makefile.am
diff --git a/src/tracker-miner-fs/tracker-config.c b/src/miners/fs/tracker-config.c
similarity index 100%
rename from src/tracker-miner-fs/tracker-config.c
rename to src/miners/fs/tracker-config.c
diff --git a/src/tracker-miner-fs/tracker-config.h b/src/miners/fs/tracker-config.h
similarity index 100%
rename from src/tracker-miner-fs/tracker-config.h
rename to src/miners/fs/tracker-config.h
diff --git a/src/tracker-miner-fs/tracker-dbus.c b/src/miners/fs/tracker-dbus.c
similarity index 100%
rename from src/tracker-miner-fs/tracker-dbus.c
rename to src/miners/fs/tracker-dbus.c
diff --git a/src/tracker-miner-fs/tracker-dbus.h b/src/miners/fs/tracker-dbus.h
similarity index 100%
rename from src/tracker-miner-fs/tracker-dbus.h
rename to src/miners/fs/tracker-dbus.h
diff --git a/src/tracker-miner-fs/tracker-main.c b/src/miners/fs/tracker-main.c
similarity index 100%
rename from src/tracker-miner-fs/tracker-main.c
rename to src/miners/fs/tracker-main.c
diff --git a/src/tracker-miner-fs/tracker-marshal.list b/src/miners/fs/tracker-marshal.list
similarity index 100%
rename from src/tracker-miner-fs/tracker-marshal.list
rename to src/miners/fs/tracker-marshal.list
diff --git a/src/tracker-miner-fs/tracker-miner-applications.c b/src/miners/fs/tracker-miner-applications.c
similarity index 100%
rename from src/tracker-miner-fs/tracker-miner-applications.c
rename to src/miners/fs/tracker-miner-applications.c
diff --git a/src/tracker-miner-fs/tracker-miner-applications.h b/src/miners/fs/tracker-miner-applications.h
similarity index 100%
rename from src/tracker-miner-fs/tracker-miner-applications.h
rename to src/miners/fs/tracker-miner-applications.h
diff --git a/src/tracker-miner-fs/tracker-miner-files-reindex.c b/src/miners/fs/tracker-miner-files-reindex.c
similarity index 100%
rename from src/tracker-miner-fs/tracker-miner-files-reindex.c
rename to src/miners/fs/tracker-miner-files-reindex.c
diff --git a/src/tracker-miner-fs/tracker-miner-files-reindex.h b/src/miners/fs/tracker-miner-files-reindex.h
similarity index 98%
rename from src/tracker-miner-fs/tracker-miner-files-reindex.h
rename to src/miners/fs/tracker-miner-files-reindex.h
index f95868f..20e132e 100644
--- a/src/tracker-miner-fs/tracker-miner-files-reindex.h
+++ b/src/miners/fs/tracker-miner-files-reindex.h
@@ -26,7 +26,7 @@
 #define TRACKER_MINER_FILES_REINDEX_PATH            "/org/freedesktop/Tracker1/Miner/Files/Reindex"
 #define TRACKER_MINER_FILES_REINDEX_INTERFACE       "org.freedesktop.Tracker1.Miner.Files.Reindex"
 
-#include <tracker-miner-fs/tracker-miner-files.h>
+#include "tracker-miner-files.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
similarity index 100%
rename from src/tracker-miner-fs/tracker-miner-files.c
rename to src/miners/fs/tracker-miner-files.c
diff --git a/src/tracker-miner-fs/tracker-miner-files.h b/src/miners/fs/tracker-miner-files.h
similarity index 100%
rename from src/tracker-miner-fs/tracker-miner-files.h
rename to src/miners/fs/tracker-miner-files.h
diff --git a/src/tracker-miner-fs/tracker-volume-cleanup.c b/src/miners/fs/tracker-volume-cleanup.c
similarity index 100%
rename from src/tracker-miner-fs/tracker-volume-cleanup.c
rename to src/miners/fs/tracker-volume-cleanup.c
diff --git a/src/tracker-miner-fs/tracker-volume-cleanup.h b/src/miners/fs/tracker-volume-cleanup.h
similarity index 100%
rename from src/tracker-miner-fs/tracker-volume-cleanup.h
rename to src/miners/fs/tracker-volume-cleanup.h
diff --git a/src/tracker-miner-rss/Makefile.am b/src/miners/rss/Makefile.am
similarity index 100%
rename from src/tracker-miner-rss/Makefile.am
rename to src/miners/rss/Makefile.am
diff --git a/src/tracker-miner-rss/tracker-main.c b/src/miners/rss/tracker-main.c
similarity index 100%
rename from src/tracker-miner-rss/tracker-main.c
rename to src/miners/rss/tracker-main.c
diff --git a/src/tracker-miner-rss/tracker-miner-rss.c b/src/miners/rss/tracker-miner-rss.c
similarity index 100%
rename from src/tracker-miner-rss/tracker-miner-rss.c
rename to src/miners/rss/tracker-miner-rss.c
diff --git a/src/tracker-miner-rss/tracker-miner-rss.h b/src/miners/rss/tracker-miner-rss.h
similarity index 100%
rename from src/tracker-miner-rss/tracker-miner-rss.h
rename to src/miners/rss/tracker-miner-rss.h
diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am
index c5b1e08..71d7468 100644
--- a/src/tracker-preferences/Makefile.am
+++ b/src/tracker-preferences/Makefile.am
@@ -25,8 +25,8 @@ BUILT_SOURCES = 							\
 	tracker-preferences.vala.stamp
 
 config_class_sources = \
-	$(top_srcdir)/src/tracker-miner-fs/tracker-config.h		\
-	$(top_srcdir)/src/tracker-miner-fs/tracker-config.c		\
+	$(top_srcdir)/src/miners/fs/tracker-config.h			\
+	$(top_srcdir)/src/miners/fs/tracker-config.c			\
 	$(top_srcdir)/src/tracker-status-icon/tracker-icon-config.h	\
 	$(top_srcdir)/src/tracker-status-icon/tracker-icon-config.c
 
diff --git a/src/tracker-preferences/tracker-config.vapi b/src/tracker-preferences/tracker-config.vapi
index 6ef6eca..538be29 100644
--- a/src/tracker-preferences/tracker-config.vapi
+++ b/src/tracker-preferences/tracker-config.vapi
@@ -20,7 +20,7 @@
  */
 
 namespace Tracker {
-	[CCode (cheader_filename = "tracker-miner-fs/tracker-config.h")]
+	[CCode (cheader_filename = "miners/fs/tracker-config.h")]
 	public class Config : GLib.Object {
 		public Config.with_domain (string domain);
 
diff --git a/tests/tracker-miner-fs/Makefile.am b/tests/tracker-miner-fs/Makefile.am
index 2dcc149..5849267 100644
--- a/tests/tracker-miner-fs/Makefile.am
+++ b/tests/tracker-miner-fs/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = 									\
 	-I$(top_srcdir)/src							\
 	-I$(top_srcdir)/tests/common						\
 	-I$(top_builddir)/src/tracker-store					\
-	-I$(top_builddir)/src/tracker-miner-fs					\
+	-I$(top_builddir)/src/miners/fs						\
 	$(WARN_CFLAGS)								\
 	$(GLIB2_CFLAGS)								\
 	$(GCOV_CFLAGS)								\
@@ -24,8 +24,8 @@ INCLUDES = 									\
 	$(DBUS_CFLAGS)
 
 tracker_metadata_utils_SOURCES = 						\
-	$(top_srcdir)/src/tracker-miner-fs/tracker-config.c			\
-	$(top_srcdir)/src/tracker-miner-fs/tracker-marshal.c			\
+	$(top_srcdir)/src/miners/fs/tracker-config.c				\
+	$(top_srcdir)/src/miners/fs/tracker-marshal.c				\
 	tracker-metadata-utils-test.c
 
 tracker_metadata_utils_LDADD =	                                        	\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]