libtracker-miner: Make TrackerCrawler private

This object can remain entirely private, as it is wrapped in quite more
convenient ways by TrackerMinerFS (ie. tracking of additions/removals,
file monitoring...), so turn it fully private.

5 files changed, 14 insertions, 11 deletions

diff --git a/src/libtracker-miner/Makefile-shared-sources.decl b/src/libtracker-miner/Makefile-shared-sources.decl
index 4cbfecfae..702885e4e 100644
--- a/src/libtracker-miner/Makefile-shared-sources.decl
+++ b/src/libtracker-miner/Makefile-shared-sources.decl
@@ -13,3 +13,9 @@ libtracker_miner_file_system_sources =                          \
 
 libtracker_miner_file_system_headers =                          \
 	$(top_srcdir)/src/libtracker-miner/tracker-file-system.h
+
+libtracker_miner_crawler_sources =                          \
+	$(top_srcdir)/src/libtracker-miner/tracker-crawler.c
+
+libtracker_miner_crawler_headers =                          \
+	$(top_srcdir)/src/libtracker-miner/tracker-crawler.h
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index cd10352c6..dc46ecac0 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -32,13 +32,9 @@ noinst_LTLIBRARIES = libtracker-miner-private.la
 libtracker_minerdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_minerincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-miner/
 
-crawler_sources = 				       \
+private_sources = 				       \
 	tracker-crawler.c                              \
 	tracker-crawler.h                              \
-	tracker-utils.c                                \
-	tracker-utils.h					
-
-private_sources = 				       \
 	tracker-file-notifier.h                        \
 	tracker-file-notifier.c                        \
 	tracker-file-system.h                          \
@@ -52,7 +48,9 @@ private_sources = 				       \
 	tracker-sparql-buffer.h                        \
 	tracker-sparql-buffer.c                        \
 	tracker-thumbnailer.c                          \
-	tracker-thumbnailer.h
+	tracker-thumbnailer.h                          \
+	tracker-utils.c                                \
+	tracker-utils.h
 
 miner_sources = 				       \
 	$(libtracker_miner_monitor_sources)            \
@@ -81,7 +79,6 @@ libtracker_miner_private_la_SOURCES =                  \
 libtracker_miner_@TRACKER_API_VERSION@_la_SOURCES =    \
 	$(network_provider_sources)                    \
 	$(password_provider_sources)                   \
-	$(crawler_sources)			       \
 	$(miner_sources)			       \
 	tracker-indexing-tree.c                        \
 	tracker-indexing-tree.h                        \
@@ -89,7 +86,6 @@ libtracker_miner_@TRACKER_API_VERSION@_la_SOURCES =    \
 	tracker-password-provider.c
 
 libtracker_minerinclude_HEADERS =                      \
-	tracker-crawler.h                              \
 	tracker-decorator.h                            \
 	tracker-decorator-fs.h                         \
 	tracker-indexing-tree.h                        \
@@ -110,7 +106,7 @@ if !ENABLE_GCOV
 # Using enable_gcov instead of have_unit_test because when doing a release
 #  we disable gcov but NOT the unit tests
 libtracker_miner_@TRACKER_API_VERSION@_la_LDFLAGS +=    \
-	-export-symbols-regex '^tracker_(miner|crawler|password_provider|network_provider|indexing_tree|file_system|file_notifier|directory_flags|filter_type|filter_policy|decorator)_.*'
+	-export-symbols-regex '^tracker_(miner|password_provider|network_provider|indexing_tree|file_system|file_notifier|directory_flags|filter_type|filter_policy|decorator)_.*'
 endif
 
 libtracker_miner_@TRACKER_API_VERSION@_la_LIBADD =     \
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index 5fc379316..1f7e9deb2 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -22,7 +22,6 @@
 
 #define __LIBTRACKER_MINER_H_INSIDE__
 
-#include <libtracker-miner/tracker-crawler.h>
 #include <libtracker-miner/tracker-decorator.h>
 #include <libtracker-miner/tracker-decorator-fs.h>
 #include <libtracker-miner/tracker-network-provider.h>
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index e2c447f6e..b1d06311b 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -65,6 +65,8 @@ libtracker_miner_tests_la_LIBADD = 		       \
 	$(BUILD_LIBS)
 
 tracker_crawler_test_SOURCES = \
+	$(libtracker_miner_crawler_sources) \
+	$(libtracker_miner_crawler_headers) \
 	tracker-crawler-test.c
 
 tracker_miner_manager_test_SOURCES = \
diff --git a/tests/libtracker-miner/tracker-crawler-test.c b/tests/libtracker-miner/tracker-crawler-test.c
index e00801a74..69a9630c6 100644
--- a/tests/libtracker-miner/tracker-crawler-test.c
+++ b/tests/libtracker-miner/tracker-crawler-test.c
@@ -21,7 +21,7 @@
 
 #include <locale.h>
 
-#include <libtracker-miner/tracker-miner.h>
+#include <libtracker-miner/tracker-crawler.h>
 
 typedef struct CrawlerTest CrawlerTest;