[tracker/configure-for-binaries: 75/80] build: Replaced all trailing tabs before \ for spaces in Makefile.ams



commit 4bd1ca0dbfa11da662af6dc1e483cf6cfb411242
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Oct 26 17:07:39 2010 +0100

    build: Replaced all trailing tabs before \ for spaces in Makefile.ams
    
    Also standardise the width to 55 characters (unless line is longer)

 Makefile.am                                        |  108 +++++-----
 data/Makefile.am                                   |   54 +++---
 data/dbus/Makefile.am                              |   46 ++--
 data/icons/Makefile.am                             |    8 +-
 data/icons/scalable/Makefile.am                    |    4 +-
 data/languages/Makefile.am                         |   26 ++--
 data/miners/Makefile.am                            |   28 ++--
 data/ontologies/Makefile.am                        |   46 ++--
 docs/Makefile.am                                   |    2 +-
 docs/design/Makefile.am                            |    6 +-
 docs/manpages/Makefile.am                          |   38 ++--
 docs/reference/Makefile.am                         |   10 +-
 docs/reference/libtracker-client/Makefile.am       |   14 +-
 docs/reference/libtracker-extract/Makefile.am      |   12 +-
 docs/reference/libtracker-miner/Makefile.am        |   36 ++--
 docs/reference/libtracker-sparql/Makefile.am       |   10 +-
 docs/reference/ontology/Makefile.am                |   98 +++++-----
 docs/tools/Makefile.am                             |   34 ++--
 examples/Makefile.am                               |    8 +-
 examples/class-signal/Makefile.am                  |   10 +-
 examples/libtracker-extract/Makefile.am            |   12 +-
 examples/libtracker-miner/Makefile.am              |   20 +-
 examples/rss-reader/Makefile.am                    |   12 +-
 src/Makefile.am                                    |   37 ++--
 src/libtracker-bus/Makefile.am                     |   62 +++---
 src/libtracker-client/Makefile.am                  |   60 +++---
 src/libtracker-common/Makefile.am                  |   92 ++++----
 src/libtracker-data/Makefile.am                    |  126 ++++++------
 src/libtracker-direct/Makefile.am                  |   40 ++--
 src/libtracker-extract/Makefile.am                 |   44 ++--
 src/libtracker-fts/Makefile.am                     |   32 ++--
 src/libtracker-miner/Makefile.am                   |  104 +++++-----
 src/libtracker-sparql/Makefile.am                  |   66 +++---
 src/miners/flickr/Makefile.am                      |   53 +++---
 src/miners/fs/Makefile.am                          |   62 +++---
 src/miners/rss/Makefile.am                         |   28 ++--
 src/plugins/evolution/Makefile.am                  |   38 ++--
 src/plugins/nautilus/Makefile.am                   |   24 +-
 src/tracker-control/Makefile.am                    |   28 ++--
 src/tracker-explorer/Makefile.am                   |   28 ++--
 src/tracker-extract/Makefile.am                    |  222 ++++++++++----------
 src/tracker-preferences/Makefile.am                |   54 +++---
 src/tracker-search-bar/Makefile.am                 |   44 ++--
 src/tracker-search-tool/Makefile.am                |   44 ++--
 src/tracker-status-icon/Makefile.am                |   46 ++--
 src/tracker-store/Makefile.am                      |   88 ++++----
 src/tracker-utils/Makefile.am                      |   36 ++--
 src/tracker-writeback/Makefile.am                  |   66 +++---
 src/vapi/Makefile.am                               |    4 +-
 tests/Makefile.am                                  |   18 +-
 tests/common/Makefile.am                           |   14 +-
 tests/functional-tests/Makefile.am                 |   98 +++++-----
 .../common/data/Images/Makefile.am                 |    6 +-
 tests/functional-tests/common/data/Makefile.am     |   14 +-
 .../functional-tests/common/data/Music/Makefile.am |    2 +-
 .../functional-tests/common/data/Video/Makefile.am |    2 +-
 tests/functional-tests/common/utils/Makefile.am    |   18 +-
 tests/functional-tests/ipc/Makefile.am             |  104 +++++-----
 .../test-configurations/Makefile.am                |    2 +-
 .../miner-basic-ops/Makefile.am                    |    6 +-
 .../test-configurations/writeback/Makefile.am      |    6 +-
 .../test-extraction-data/audio/Makefile.am         |   10 +-
 .../test-extraction-data/images/Makefile.am        |   20 +-
 .../test-extraction-data/office/Makefile.am        |   14 +-
 .../test-extraction-data/playlists/Makefile.am     |    6 +-
 .../test-extraction-data/video/Makefile.am         |    8 +-
 tests/functional-tests/test-ontologies/Makefile.am |   18 +-
 .../test-ontologies/add-class/Makefile.am          |   16 +-
 .../test-ontologies/add-domainIndex/Makefile.am    |   16 +-
 .../test-ontologies/add-prop/Makefile.am           |   16 +-
 .../test-ontologies/basic-future/Makefile.am       |   16 +-
 .../test-ontologies/basic/Makefile.am              |   16 +-
 .../test-ontologies/cardinality/Makefile.am        |   16 +-
 .../test-ontologies/indexed/Makefile.am            |   16 +-
 .../test-ontologies/notify/Makefile.am             |   16 +-
 .../property-range-int-to-string/Makefile.am       |   16 +-
 .../property-range-string-to-date/Makefile.am      |   16 +-
 .../test-writeback-data/Makefile.am                |    8 +-
 tests/functional-tests/ttl/Makefile.am             |   81 ++++----
 tests/functional-tests/unittest2/Makefile.am       |   30 ++--
 tests/libtracker-client/Makefile.am                |   16 +-
 tests/libtracker-common/Makefile.am                |   32 ++--
 tests/libtracker-data/Makefile.am                  |  138 ++++++------
 tests/libtracker-data/aggregates/Makefile.am       |   16 +-
 tests/libtracker-data/algebra/Makefile.am          |   80 ++++----
 tests/libtracker-data/anon/Makefile.am             |    8 +-
 tests/libtracker-data/ask/Makefile.am              |    8 +-
 tests/libtracker-data/backup/Makefile.am           |    4 +-
 tests/libtracker-data/basic/Makefile.am            |   28 ++--
 .../libtracker-data/bnode-coreference/Makefile.am  |    8 +-
 tests/libtracker-data/bound/Makefile.am            |    8 +-
 tests/libtracker-data/datetime/Makefile.am         |   24 +-
 tests/libtracker-data/error/Makefile.am            |   23 +-
 tests/libtracker-data/expr-ops/Makefile.am         |   36 ++--
 tests/libtracker-data/functions/Makefile.am        |   52 +++---
 tests/libtracker-data/graph/Makefile.am            |   28 ++--
 tests/libtracker-data/nie/Makefile.am              |   54 +++---
 tests/libtracker-data/nmo/Makefile.am              |   66 +++---
 tests/libtracker-data/optional/Makefile.am         |   16 +-
 tests/libtracker-data/regex/Makefile.am            |   12 +-
 tests/libtracker-data/sort/Makefile.am             |   48 ++--
 tests/libtracker-data/subqueries/Makefile.am       |   16 +-
 tests/libtracker-data/turtle/Makefile.am           |   16 +-
 tests/libtracker-extract/Makefile.am               |   22 +-
 tests/libtracker-fts/Makefile.am                   |   48 ++--
 tests/libtracker-fts/limits/Makefile.am            |   18 +-
 tests/libtracker-fts/prefix/Makefile.am            |   14 +-
 tests/libtracker-miner/Makefile.am                 |   90 ++++----
 tests/libtracker-sparql/Makefile.am                |   16 +-
 tests/tracker-steroids/Makefile.am                 |   20 +-
 tests/tracker-writeback/Makefile.am                |    4 +-
 utils/Makefile.am                                  |   12 +-
 utils/data-generators/Makefile.am                  |    2 +-
 utils/data-generators/cc/Makefile.am               |   36 ++--
 utils/gtk-sparql/Makefile.am                       |   10 +-
 utils/lyrics/Makefile.am                           |    2 +-
 utils/mtp/Makefile.am                              |   16 +-
 utils/playlists/Makefile.am                        |   10 +-
 utils/services/Makefile.am                         |   18 +-
 119 files changed, 1944 insertions(+), 1946 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f421646..714043b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,32 +15,32 @@ coverage:
 coverage-report: coverage
 	lcov --directory $(top_srcdir)/src --capture --output-file $(top_builddir)/lcov.info
 	lcov --directory $(top_srcdir)/src --output-file $(top_builddir)/lcov.info --remove $(top_builddir)/lcov.info \
-		tracker-sparql-builder.c \
-		tracker-sparql-expression.c \
-		tracker-sparql-pattern.c \
-		tracker-sparql-query.c \
-		tracker-sparql-scanner.c \
-		tracker-turtle-reader.c \
-		tracker-turtle-writer.c \
-		libtracker-bus/tracker-array-cursor.c \
-		libtracker-bus/tracker-bus.c \
-		libtracker-direct/tracker-direct.c \
-		libtracker-miner/tracker-storage.c \
-		libtracker-miner/tracker-dbus.c \
-		libtracker-miner/tracker-miner-fs.c \
+		tracker-sparql-builder.c               \
+		tracker-sparql-expression.c            \
+		tracker-sparql-pattern.c               \
+		tracker-sparql-query.c                 \
+		tracker-sparql-scanner.c               \
+		tracker-turtle-reader.c                \
+		tracker-turtle-writer.c                \
+		libtracker-bus/tracker-array-cursor.c  \
+		libtracker-bus/tracker-bus.c           \
+		libtracker-direct/tracker-direct.c     \
+		libtracker-miner/tracker-storage.c     \
+		libtracker-miner/tracker-dbus.c        \
+		libtracker-miner/tracker-miner-fs.c    \
 		libtracker-miner/tracker-miner-object.c \
-		libtracker-miner/tracker-miner-web.c \
+		libtracker-miner/tracker-miner-web.c   \
 		libtracker-miner/tracker-network-provider.c \
 		libtracker-miner/tracker-network-provider-network-manager.c \
-		libtracker-sparql/tracker-builder.c \
+		libtracker-sparql/tracker-builder.c    \
 		libtracker-sparql/tracker-connection.c \
-		libtracker-sparql/tracker-cursor.c \
+		libtracker-sparql/tracker-cursor.c     \
 		libtracker-sparql/tracker-plugin-loader.c \
-		libtracker-sparql/tracker-utils.c \
+		libtracker-sparql/tracker-utils.c      \
 		tracker-control/tracker-miner-files-index-client.h \
-		"*.vapi" \
-		"*-glue.h" \
-		"tracker-marshal.*" \
+		"*.vapi"                               \
+		"*-glue.h"                             \
+		"tracker-marshal.*"                    \
 		"inotify-*.*"
 	rm -rf $(top_builddir)/coverage
 	$(mkdir_p) $(top_builddir)/coverage
@@ -52,49 +52,49 @@ dist-hook: gen-ChangeLog
 gen_start_date = 2009-04-10
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-	if test -d .git; then						\
-	  $(top_srcdir)/gitlog-to-changelog				\
-	    --since=$(gen_start_date) > $(distdir)/cl-t;		\
-	  rm -f $(distdir)/ChangeLog;					\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
+	if test -d .git; then                          \
+	  $(top_srcdir)/gitlog-to-changelog            \
+	    --since=$(gen_start_date) > $(distdir)/cl-t; \
+	  rm -f $(distdir)/ChangeLog;                  \
+	  mv $(distdir)/cl-t $(distdir)/ChangeLog;     \
 	fi
 
-functional-test: 
+functional-test:
 	cd tests/functional-tests/ && $(MAKE) $(AM_MAKEFLAGS) $@
 
-EXTRA_DIST = 					\
-	ChangeLog.pre-0-6-93			\
-	gitlog-to-changelog			\
-	intltool-extract.in 			\
-	intltool-merge.in 			\
+EXTRA_DIST =                                           \
+	ChangeLog.pre-0-6-93                           \
+	gitlog-to-changelog                            \
+	intltool-extract.in                            \
+	intltool-merge.in                              \
 	intltool-update.in
 
-DISTCLEANFILES = 				\
-	intltool-extract 			\
-	intltool-merge 				\
+DISTCLEANFILES =                                       \
+	intltool-extract                               \
+	intltool-merge                                 \
 	intltool-update
 
-DISTCHECK_CONFIGURE_FLAGS =			\
+DISTCHECK_CONFIGURE_FLAGS =                            \
 	--with-session-bus-services-dir="\$(datadir)"/dbus-1/services \
-	--disable-nautilus-extension		\
-	--enable-unit-tests			\
-	--enable-functional-tests		\
-	--enable-gtk-doc			\
-	--enable-miner-rss			\
-	--enable-miner-flickr			\
-	--disable-miner-evolution		\
-	--enable-poppler			\
-	--enable-exempi				\
-	--enable-libiptcdata			\
-	--enable-libjpeg			\
-	--enable-libtiff			\
-	--enable-libvorbis			\
-	--enable-libflac			\
-	--enable-libgsf				\
-	--enable-playlist			\
-	--enable-tracker-preferences		\
-	--enable-tracker-search-bar		\
-	--enable-tracker-status-icon		\
+	--disable-nautilus-extension                   \
+	--enable-unit-tests                            \
+	--enable-functional-tests                      \
+	--enable-gtk-doc                               \
+	--enable-miner-rss                             \
+	--enable-miner-flickr                          \
+	--disable-miner-evolution                      \
+	--enable-poppler                               \
+	--enable-exempi                                \
+	--enable-libiptcdata                           \
+	--enable-libjpeg                               \
+	--enable-libtiff                               \
+	--enable-libvorbis                             \
+	--enable-libflac                               \
+	--enable-libgsf                                \
+	--enable-playlist                              \
+	--enable-tracker-preferences                   \
+	--enable-tracker-search-bar                    \
+	--enable-tracker-status-icon                   \
 	--with-enca
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/data/Makefile.am b/data/Makefile.am
index d0d149f..d62df53 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,44 +4,44 @@ SUBDIRS = dbus languages icons ontologies miners
 
 # First we fix the VERSION and libexecdir in the desktop files
 tracker-status-icon.desktop.in: tracker-status-icon.desktop.in.in
-	@sed -e "s|@bindir[ ]|${bindir}|" 		\
+	@sed -e "s|@bindir[ ]|${bindir}|"              \
 	     -e "s|@VERSION[ ]|${VERSION}|" $< > $@
 
 tracker-store.desktop.in: tracker-store.desktop.in.in
-	@sed -e "s|@libexecdir[ ]|${libexecdir}|" 	\
+	@sed -e "s|@libexecdir[ ]|${libexecdir}|"      \
 	     -e "s|@VERSION[ ]|${VERSION}|" $< > $@
 
 tracker-miner-fs.desktop.in: tracker-miner-fs.desktop.in.in
-	@sed -e "s|@libexecdir[ ]|${libexecdir}|" 	\
+	@sed -e "s|@libexecdir[ ]|${libexecdir}|"      \
 	     -e "s|@VERSION[ ]|${VERSION}|" $< > $@
 
 tracker-miner-flickr.desktop.in: tracker-miner-flickr.desktop.in.in
-	@$(SED) -e "s|@libexecdir[ ]|${libexecdir}|" 	\
+	@$(SED) -e "s|@libexecdir[ ]|${libexecdir}|"   \
 	     -e "s|@VERSION[ ]|${VERSION}|" $< > $@
 
 tracker-miner-rss.desktop.in: tracker-miner-rss.desktop.in.in
-	@$(SED) -e "s|@libexecdir[ ]|${libexecdir}|" 	\
+	@$(SED) -e "s|@libexecdir[ ]|${libexecdir}|"   \
 	     -e "s|@VERSION[ ]|${VERSION}|" $< > $@
 
-desktop_in_in_files = 					\
-	tracker-status-icon.desktop.in.in		\
-	tracker-store.desktop.in.in			\
-	tracker-miner-fs.desktop.in.in			\
-	tracker-miner-flickr.desktop.in.in		\
+desktop_in_in_files =                                  \
+	tracker-status-icon.desktop.in.in              \
+	tracker-store.desktop.in.in                    \
+	tracker-miner-fs.desktop.in.in                 \
+	tracker-miner-flickr.desktop.in.in             \
 	tracker-miner-rss.desktop.in.in
 
 # Second take those new .in files and translate them
-desktop_in_files = 					\
-	tracker-status-icon.desktop.in			\
-	tracker-store.desktop.in			\
-	tracker-miner-fs.desktop.in			\
-	tracker-miner-flickr.desktop.in			\
+desktop_in_files =                                     \
+	tracker-status-icon.desktop.in                 \
+	tracker-store.desktop.in                       \
+	tracker-miner-fs.desktop.in                    \
+	tracker-miner-flickr.desktop.in                \
 	tracker-miner-rss.desktop.in
 
 # Third we choose what we want installed based on config
 autostartdir = $(sysconfdir)/xdg/autostart
-autostart_DATA = 					\
-	tracker-store.desktop				\
+autostart_DATA =                                       \
+	tracker-store.desktop                          \
 	tracker-miner-fs.desktop
 
 if HAVE_TRACKER_STATUS_ICON
@@ -60,10 +60,10 @@ endif
 
 # Set up pkg-config .pc files for exported libraries
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = 					\
-	tracker-sparql-$(TRACKER_API_VERSION).pc	\
-	tracker-client-$(TRACKER_API_VERSION).pc	\
-	tracker-extract-$(TRACKER_API_VERSION).pc	\
+pkgconfig_DATA =                                       \
+	tracker-sparql-$(TRACKER_API_VERSION).pc       \
+	tracker-client-$(TRACKER_API_VERSION).pc       \
+	tracker-extract-$(TRACKER_API_VERSION).pc      \
 	tracker-miner-$(TRACKER_API_VERSION).pc
 
 tracker-sparql-$(TRACKER_API_VERSION).pc: tracker-sparql.pc
@@ -78,12 +78,12 @@ tracker-extract-$(TRACKER_API_VERSION).pc: tracker-extract.pc
 tracker-miner-$(TRACKER_API_VERSION).pc: tracker-miner.pc
 	cp $< $@
 
-CLEANFILES = 						\
-	$(autostart_DATA) 				\
-	$(desktop_in_files)				\
-	tracker-sparql-$(TRACKER_API_VERSION).pc	\
-	tracker-client-$(TRACKER_API_VERSION).pc	\
-	tracker-extract-$(TRACKER_API_VERSION).pc	\
+CLEANFILES =                                           \
+	$(autostart_DATA)                              \
+	$(desktop_in_files)                            \
+	tracker-sparql-$(TRACKER_API_VERSION).pc       \
+	tracker-client-$(TRACKER_API_VERSION).pc       \
+	tracker-extract-$(TRACKER_API_VERSION).pc      \
 	tracker-miner-$(TRACKER_API_VERSION).pc
 
 EXTRA_DIST = $(desktop_in_in_files)
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index 9a296bf..4549048 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -2,27 +2,27 @@ include $(top_srcdir)/Makefile.decl
 
 configdir = $(datadir)/tracker
 
-config_DATA =							\
-	tracker-backup.xml					\
-	tracker-extract.xml					\
-	tracker-miner.xml					\
-	tracker-miner-web.xml					\
-	tracker-resources.xml					\
-	tracker-statistics.xml					\
-	tracker-writeback.xml					\
+config_DATA =                                          \
+	tracker-backup.xml                             \
+	tracker-extract.xml                            \
+	tracker-miner.xml                              \
+	tracker-miner-web.xml                          \
+	tracker-resources.xml                          \
+	tracker-statistics.xml                         \
+	tracker-writeback.xml                          \
 	tracker-status.xml
 
-config_noinst = 						\
+config_noinst =                                        \
 	tracker-miner-files-index.xml
 
 # Services
-service_in_files =						\
-	org.freedesktop.Tracker1.service.in			\
-	org.freedesktop.Tracker1.Miner.Applications.service.in	\
-	org.freedesktop.Tracker1.Miner.EMails.service.in	\
-	org.freedesktop.Tracker1.Miner.Files.service.in		\
-	org.freedesktop.Tracker1.Miner.Flickr.service.in	\
-	org.freedesktop.Tracker1.Miner.RSS.service.in		\
+service_in_files =                                     \
+	org.freedesktop.Tracker1.service.in            \
+	org.freedesktop.Tracker1.Miner.Applications.service.in \
+	org.freedesktop.Tracker1.Miner.EMails.service.in \
+	org.freedesktop.Tracker1.Miner.Files.service.in \
+	org.freedesktop.Tracker1.Miner.Flickr.service.in \
+	org.freedesktop.Tracker1.Miner.RSS.service.in  \
 	org.freedesktop.Tracker1.Extract.service.in
 
 %.service: %.service.in
@@ -30,10 +30,10 @@ service_in_files =						\
 
 # Services
 servicedir = $(DBUS_SERVICES_DIR)
-service_DATA =							\
-	org.freedesktop.Tracker1.service			\
-	org.freedesktop.Tracker1.Miner.Applications.service	\
-	org.freedesktop.Tracker1.Miner.Files.service		\
+service_DATA =                                         \
+	org.freedesktop.Tracker1.service               \
+	org.freedesktop.Tracker1.Miner.Applications.service \
+	org.freedesktop.Tracker1.Miner.Files.service   \
 	org.freedesktop.Tracker1.Extract.service
 
 if HAVE_TRACKER_MINER_EVOLUTION
@@ -49,9 +49,9 @@ service_DATA += org.freedesktop.Tracker1.Miner.Flickr.service
 endif
 
 
-EXTRA_DIST = 							\
-	$(service_in_files)					\
-	$(config_DATA)						\
+EXTRA_DIST =                                           \
+	$(service_in_files)                            \
+	$(config_DATA)                                 \
 	$(config_noinst)
 
 CLEANFILES = $(service_DATA)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 8db345d..fd1efcd 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -7,10 +7,10 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
 update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
+	@-if test -z "$(DESTDIR)"; then                \
+		echo "Updating Gtk icon cache.";       \
+		$(gtk_update_icon_cache);              \
+	else                                           \
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 52d2c2c..1d5552c 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -10,6 +10,6 @@ if HAVE_TRACKER_MINER_FLICKR
 minericons_DATA += tracker-miner-flickr.svg
 endif
 
-EXTRA_DIST = 					\
-	$(icon_DATA)				\
+EXTRA_DIST =                                           \
+	$(icon_DATA)                                   \
 	tracker-miner-flickr.svg
diff --git a/data/languages/Makefile.am b/data/languages/Makefile.am
index 48e846d..eaf4ce5 100644
--- a/data/languages/Makefile.am
+++ b/data/languages/Makefile.am
@@ -2,19 +2,19 @@ include $(top_srcdir)/Makefile.decl
 
 configdir = $(datadir)/tracker/languages
 
-config_DATA =  		\
-	stopwords.da 	\
-	stopwords.de 	\
-	stopwords.en 	\
-	stopwords.es 	\
-	stopwords.fi 	\
-	stopwords.fr 	\
-	stopwords.hu	\
-	stopwords.it 	\
-	stopwords.nb 	\
-	stopwords.nl 	\
-	stopwords.pt 	\
-	stopwords.ru 	\
+config_DATA =                                          \
+	stopwords.da                                   \
+	stopwords.de                                   \
+	stopwords.en                                   \
+	stopwords.es                                   \
+	stopwords.fi                                   \
+	stopwords.fr                                   \
+	stopwords.hu                                   \
+	stopwords.it                                   \
+	stopwords.nb                                   \
+	stopwords.nl                                   \
+	stopwords.pt                                   \
+	stopwords.ru                                   \
 	stopwords.sv
 
 EXTRA_DIST = $(config_DATA)
diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am
index 2486516..be36aa4 100644
--- a/data/miners/Makefile.am
+++ b/data/miners/Makefile.am
@@ -1,23 +1,23 @@
 include $(top_srcdir)/Makefile.decl
 
-desktop_in_in_files =                            \
-	tracker-miner-applications.desktop.in.in \
-	tracker-miner-evolution.desktop.in.in    \
-	tracker-miner-files.desktop.in.in        \
-	tracker-miner-flickr.desktop.in.in       \
+desktop_in_in_files =                                  \
+	tracker-miner-applications.desktop.in.in       \
+	tracker-miner-evolution.desktop.in.in          \
+	tracker-miner-files.desktop.in.in              \
+	tracker-miner-flickr.desktop.in.in             \
 	tracker-miner-rss.desktop.in.in
 
-desktop_in_files =                               \
-	tracker-miner-applications.desktop.in    \
-	tracker-miner-evolution.desktop.in       \
-	tracker-miner-files.desktop.in           \
-	tracker-miner-flickr.desktop.in          \
+desktop_in_files =                                     \
+	tracker-miner-applications.desktop.in          \
+	tracker-miner-evolution.desktop.in             \
+	tracker-miner-files.desktop.in                 \
+	tracker-miner-flickr.desktop.in                \
 	tracker-miner-rss.desktop.in
 
 tracker_minersdir = $(datadir)/tracker/miners
 
-tracker_miners_DATA =                           \
-	tracker-miner-applications.desktop      \
+tracker_miners_DATA =                                  \
+	tracker-miner-applications.desktop             \
 	tracker-miner-files.desktop
 
 if HAVE_TRACKER_MINER_EVOLUTION
@@ -38,6 +38,6 @@ endif
 	@sed -e "s|@datadir[ ]|$(datadir)|" $< > $@
 
 EXTRA_DIST = $(desktop_in_in_files)
-CLEANFILES =                                   \
-	$(tracker_miners_DATA)                 \
+CLEANFILES =                                           \
+	$(tracker_miners_DATA)                         \
 	$(desktop_in_files)
diff --git a/data/ontologies/Makefile.am b/data/ontologies/Makefile.am
index fd578bf..d696c7c 100644
--- a/data/ontologies/Makefile.am
+++ b/data/ontologies/Makefile.am
@@ -1,37 +1,37 @@
 include $(top_srcdir)/Makefile.decl
 
-maemo_ontology =					\
-	91-maemo.ontology   91-maemo.description	\
+maemo_ontology =                                       \
+	91-maemo.ontology   91-maemo.description       \
 	92-slo.ontology     92-slo.description
 
 configdir = $(datadir)/tracker/ontologies
 
-config_DATA =						\
-	10-xsd.ontology	    10-xsd.description		\
-	11-rdf.ontology	    11-rdf.description		\
-	12-nrl.ontology	    12-nrl.description		\
-	20-dc.ontology      20-dc.description		\
-	30-nie.ontology	    30-nie.description		\
-	31-nao.ontology	    31-nao.description		\
-	32-nco.ontology     32-nco.description		\
-	33-nfo.ontology	    33-nfo.description		\
-	34-nmo.ontology	    34-nmo.description		\
-	35-ncal.ontology    35-ncal.description		\
-	36-scal.ontology    36-scal.description		\
-	37-nid3.ontology    37-nid3.description		\
-	38-nmm.ontology	    38-nmm.description		\
-	39-mto.ontology	    39-mto.description		\
-	40-mlo.ontology	    40-mlo.description		\
-	41-mfo.ontology	    41-mfo.description		\
-	89-mtp.ontology	    89-mtp.description		\
+config_DATA =                                          \
+	10-xsd.ontology	    10-xsd.description         \
+	11-rdf.ontology	    11-rdf.description         \
+	12-nrl.ontology	    12-nrl.description         \
+	20-dc.ontology      20-dc.description          \
+	30-nie.ontology	    30-nie.description         \
+	31-nao.ontology	    31-nao.description         \
+	32-nco.ontology     32-nco.description         \
+	33-nfo.ontology	    33-nfo.description         \
+	34-nmo.ontology	    34-nmo.description         \
+	35-ncal.ontology    35-ncal.description        \
+	36-scal.ontology    36-scal.description        \
+	37-nid3.ontology    37-nid3.description        \
+	38-nmm.ontology	    38-nmm.description         \
+	39-mto.ontology	    39-mto.description         \
+	40-mlo.ontology	    40-mlo.description         \
+	41-mfo.ontology	    41-mfo.description         \
+	89-mtp.ontology	    89-mtp.description         \
 	90-tracker.ontology 90-tracker.description
 
 if HAVE_MAEMO
-config_DATA += 						\
+config_DATA +=                                         \
 	$(maemo_ontology)
 endif
 
-EXTRA_DIST = 						\
-	$(maemo_ontology)				\
+EXTRA_DIST =                                           \
+	$(maemo_ontology)                              \
 	$(config_DATA)
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 102b312..6562626 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,4 +4,4 @@ SUBDIRS = manpages design
 
 if HAVE_GTK_DOC
 SUBDIRS += tools reference
-endif
\ No newline at end of file
+endif
diff --git a/docs/design/Makefile.am b/docs/design/Makefile.am
index 4e9ff5c..ab6d7c1 100644
--- a/docs/design/Makefile.am
+++ b/docs/design/Makefile.am
@@ -1,8 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
-architecture_docs =		\
-	tracker-store.dia	\
-	tracker-miner-fs.dia	\
+architecture_docs =                                    \
+	tracker-store.dia                              \
+	tracker-miner-fs.dia                           \
 	tracker-structural-view.dot
 
 EXTRA_DIST = $(architecture_docs)
diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am
index 29ede56..1550a5b 100644
--- a/docs/manpages/Makefile.am
+++ b/docs/manpages/Makefile.am
@@ -16,25 +16,25 @@ if HAVE_TRACKER_PREFERENCES
 tp = tracker-preferences.1
 endif
 
-man_MANS = 				\
-	tracker-extract.1		\
-	tracker-extract.cfg.5		\
-	tracker-fts.cfg.5		\
-	tracker-import.1		\
-	tracker-info.1			\
-	tracker-miner-fs.1		\
-	tracker-miner-fs.cfg.5		\
-	tracker-control.1		\
-	tracker-search.1		\
-	tracker-sparql.1		\
-	tracker-stats.1			\
-	tracker-status.1		\
-	tracker-store.1			\
-	tracker-store.cfg.5		\
-	tracker-tag.1			\
-	$(tsb)				\
-	$(tst)				\
-	$(ta)				\
+man_MANS =                                             \
+	tracker-extract.1                              \
+	tracker-extract.cfg.5                          \
+	tracker-fts.cfg.5                              \
+	tracker-import.1                               \
+	tracker-info.1                                 \
+	tracker-miner-fs.1                             \
+	tracker-miner-fs.cfg.5                         \
+	tracker-control.1                              \
+	tracker-search.1                               \
+	tracker-sparql.1                               \
+	tracker-stats.1                                \
+	tracker-status.1                               \
+	tracker-store.1                                \
+	tracker-store.cfg.5                            \
+	tracker-tag.1                                  \
+	$(tsb)                                         \
+	$(tst)                                         \
+	$(ta)                                          \
 	$(tp)
 
 EXTRA_DIST = $(man_MANS)
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index c46b220..f10d7cd 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,9 +1,9 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = 			\
-	libtracker-sparql	\
-	libtracker-client	\
-	libtracker-extract	\
-	libtracker-miner	\
+SUBDIRS =                                              \
+	libtracker-sparql                              \
+	libtracker-client                              \
+	libtracker-extract                             \
+	libtracker-miner                               \
 	ontology
 
diff --git a/docs/reference/libtracker-client/Makefile.am b/docs/reference/libtracker-client/Makefile.am
index f6c9cac..0c3488e 100644
--- a/docs/reference/libtracker-client/Makefile.am
+++ b/docs/reference/libtracker-client/Makefile.am
@@ -22,20 +22,20 @@ HFILE_GLOB = $(top_srcdir)/src/libtracker-client/*.h
 CFILE_GLOB = $(top_srcdir)/src/libtracker-client/*.c
 
 # Header files to ignore when scanning
-IGNORE_HFILES = 			\
-	tracker-resources-glue.h	\
+IGNORE_HFILES =                                        \
+	tracker-resources-glue.h                       \
 	tracker-statistics-glue.h
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = 								\
-	-DTRACKER_COMPILATION						\
-	-I$(top_srcdir)/src						\
+AM_CPPFLAGS =                                          \
+	-DTRACKER_COMPILATION                          \
+	-I$(top_srcdir)/src                            \
 	$(LIBTRACKER_CLIENT_CFLAGS)
 
-GTKDOC_LIBS =								\
+GTKDOC_LIBS =                                          \
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(LIBTRACKER_CLIENT_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
diff --git a/docs/reference/libtracker-extract/Makefile.am b/docs/reference/libtracker-extract/Makefile.am
index a960379..04ed088 100644
--- a/docs/reference/libtracker-extract/Makefile.am
+++ b/docs/reference/libtracker-extract/Makefile.am
@@ -26,14 +26,14 @@ IGNORE_HFILES =
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = 								\
-	-DTRACKER_COMPILATION						\
-	-I$(top_srcdir)/src						\
+AM_CPPFLAGS =                                          \
+	-DTRACKER_COMPILATION                          \
+	-I$(top_srcdir)/src                            \
 	$(LIBTRACKER_EXTRACT_CFLAGS)
 
-GTKDOC_LIBS =								\
+GTKDOC_LIBS =                                          \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(LIBTRACKER_EXTRACT_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
@@ -43,7 +43,7 @@ MKDB_OPTIONS = --sgml-mode --output-format=xml
 MKHTML_OPTIONS=--path="$(abs_builddir)"
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files =						\
+content_files =                                        \
 	version.xml
 
 expand_content_files =
diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am
index 25c541e..44418d2 100644
--- a/docs/reference/libtracker-miner/Makefile.am
+++ b/docs/reference/libtracker-miner/Makefile.am
@@ -22,30 +22,30 @@ HFILE_GLOB=$(top_srcdir)/src/libtracker-miner/*.h
 CFILE_GLOB=$(top_srcdir)/src/libtracker-miner/*.c
 
 # Header files to ignore when scanning
-IGNORE_HFILES=								\
-	tracker-crawler.h						\
-	tracker-dbus.h							\
-	tracker-marshal.h						\
-	tracker-miner-client.h						\
-	tracker-miner-dbus.h						\
-	tracker-miner-glue.h						\
-	tracker-miner-web-dbus.h					\
-	tracker-miner-web-glue.h					\
-	tracker-miner-web-glue.h					\
-	tracker-monitor.h						\
+IGNORE_HFILES=                                         \
+	tracker-crawler.h                              \
+	tracker-dbus.h                                 \
+	tracker-marshal.h                              \
+	tracker-miner-client.h                         \
+	tracker-miner-dbus.h                           \
+	tracker-miner-glue.h                           \
+	tracker-miner-web-dbus.h                       \
+	tracker-miner-web-glue.h                       \
+	tracker-miner-web-glue.h                       \
+	tracker-monitor.h                              \
 	tracker-utils.h
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = 								\
-	-DTRACKER_COMPILATION						\
-	-I$(top_srcdir)/src						\
+AM_CPPFLAGS =                                          \
+	-DTRACKER_COMPILATION                          \
+	-I$(top_srcdir)/src                            \
 	$(LIBTRACKER_MINER_CFLAGS)
 
-GTKDOC_LIBS =								\
-	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	 \
+GTKDOC_LIBS =                                          \
+	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(LIBTRACKER_MINER_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
@@ -55,7 +55,7 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml
 MKHTML_OPTIONS=--path="$(abs_builddir)"
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files =						\
+content_files =                                        \
 	version.xml
 
 expand_content_files =
diff --git a/docs/reference/libtracker-sparql/Makefile.am b/docs/reference/libtracker-sparql/Makefile.am
index 3127900..3649b66 100644
--- a/docs/reference/libtracker-sparql/Makefile.am
+++ b/docs/reference/libtracker-sparql/Makefile.am
@@ -26,14 +26,14 @@ IGNORE_HFILES =
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS = 								\
-	-DTRACKER_COMPILATION						\
-	-I$(top_srcdir)/src						\
+AM_CPPFLAGS =                                          \
+	-DTRACKER_COMPILATION                          \
+	-I$(top_srcdir)/src                            \
 	$(LIBTRACKER_SPARQL_CFLAGS)
 
-GTKDOC_LIBS =								\
+GTKDOC_LIBS =                                          \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(LIBTRACKER_SPARQL_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
diff --git a/docs/reference/ontology/Makefile.am b/docs/reference/ontology/Makefile.am
index 345e2e0..cf2a096 100644
--- a/docs/reference/ontology/Makefile.am
+++ b/docs/reference/ontology/Makefile.am
@@ -4,22 +4,22 @@ AUTOMAKE_OPTIONS = 1.6
 
 # Generation of ontology.png using ontology-graph
 ontology.png:
-	$(top_builddir)/docs/tools/ontology-graph 			\
-		-d $(top_srcdir)/data/ontologies 			\
+	$(top_builddir)/docs/tools/ontology-graph      \
+		-d $(top_srcdir)/data/ontologies       \
 		-o ontology.dot
 	$(AM_V_GEN) $(GRAPHVIZ_FDP) -Tpng -o $@ ontology.dot
 	rm ontology.dot
 
 # Generation of the additional PNG files from DIA files
 #  (list of original '.dia' files with '.png' extension)
-ONTOLOGY_DIAGRAMS =							\
-	$(top_srcdir)/docs/ontologies/notation.dia			\
-	$(top_srcdir)/docs/ontologies/mfo/feeds-overview.dia		\
-	$(top_srcdir)/docs/ontologies/nmm/radio-overview.dia		\
-	$(top_srcdir)/docs/ontologies/nmm/images-overview.dia		\
-	$(top_srcdir)/docs/ontologies/mlo/location-overview.dia		\
-	$(top_srcdir)/docs/ontologies/nie/overview.dia			\
-	$(top_srcdir)/docs/ontologies/nmo/message-class-overview.dia	\
+ONTOLOGY_DIAGRAMS =                                    \
+	$(top_srcdir)/docs/ontologies/notation.dia     \
+	$(top_srcdir)/docs/ontologies/mfo/feeds-overview.dia \
+	$(top_srcdir)/docs/ontologies/nmm/radio-overview.dia \
+	$(top_srcdir)/docs/ontologies/nmm/images-overview.dia \
+	$(top_srcdir)/docs/ontologies/mlo/location-overview.dia \
+	$(top_srcdir)/docs/ontologies/nie/overview.dia \
+	$(top_srcdir)/docs/ontologies/nmo/message-class-overview.dia \
 	$(top_srcdir)/docs/ontologies/nmo/email-mimeparts-overview.dia
 
 # The wanted PNG files
@@ -30,39 +30,39 @@ $(ONTOLOGY_DIAGRAMS_PNG): $(ONTOLOGY_DIAGRAMS)
 	dia -t png $^ 2>/dev/null
 
 # The original Ontology explanation files
-ONTOLOGY_EXPLANATIONS = 						\
-	$(top_srcdir)/docs/ontologies/mfo/explanation.xml		\
-	$(top_srcdir)/docs/ontologies/nmm/explanation.xml		\
-	$(top_srcdir)/docs/ontologies/mlo/explanation.xml		\
-	$(top_srcdir)/docs/ontologies/nie/explanation.xml		\
-	$(top_srcdir)/docs/ontologies/nmm/explanation.xml		\
+ONTOLOGY_EXPLANATIONS =                                \
+	$(top_srcdir)/docs/ontologies/mfo/explanation.xml \
+	$(top_srcdir)/docs/ontologies/nmm/explanation.xml \
+	$(top_srcdir)/docs/ontologies/mlo/explanation.xml \
+	$(top_srcdir)/docs/ontologies/nie/explanation.xml \
+	$(top_srcdir)/docs/ontologies/nmm/explanation.xml \
 	$(top_srcdir)/docs/ontologies/nmo/explanation.xml
 
 # The XMLs to generate from the Ontology info
-ONTOLOGY_INFOS_XML =							\
-	fts-properties.xml						\
-	dc-ontology.xml							\
-	nie-ontology.xml						\
-	nco-ontology.xml						\
-	nmo-ontology.xml						\
-	nfo-ontology.xml						\
-	nao-ontology.xml						\
-	mto-ontology.xml						\
-	nmm-ontology.xml						\
-	mfo-ontology.xml						\
-	mlo-ontology.xml						\
-	tracker-ontology.xml						\
-	maemo-ontology.xml						\
-	ncal-ontology.xml						\
-	scal-ontology.xml						\
+ONTOLOGY_INFOS_XML =                                   \
+	fts-properties.xml                             \
+	dc-ontology.xml                                \
+	nie-ontology.xml                               \
+	nco-ontology.xml                               \
+	nmo-ontology.xml                               \
+	nfo-ontology.xml                               \
+	nao-ontology.xml                               \
+	mto-ontology.xml                               \
+	nmm-ontology.xml                               \
+	mfo-ontology.xml                               \
+	mlo-ontology.xml                               \
+	tracker-ontology.xml                           \
+	maemo-ontology.xml                             \
+	ncal-ontology.xml                              \
+	scal-ontology.xml                              \
 	xsd-ontology.xml
 
 # Generation of the ontology XML files.
 gen-doc.stamp: $(ONTOLOGY_EXPLANATIONS)
-	$(top_srcdir)/docs/tools/gen-doc.sh 				\
-		$(top_builddir)/docs/tools/ttl2sgml			\
-		$(top_srcdir)/data/ontologies 				\
-		$(top_srcdir)/docs/ontologies 				\
+	$(top_srcdir)/docs/tools/gen-doc.sh            \
+		$(top_builddir)/docs/tools/ttl2sgml    \
+		$(top_srcdir)/data/ontologies          \
+		$(top_srcdir)/docs/ontologies          \
 			.
 	$(AM_V_GEN) touch $@
 
@@ -85,16 +85,16 @@ MKDB_OPTIONS = --sgml-mode --output-format=xml
 MKHTML_OPTIONS=--path="$(abs_builddir)"
 
 # Images to copy into HTML directory
-HTML_IMAGES = 								\
-	$(ONTOLOGY_DIAGRAMS_PNG)					\
+HTML_IMAGES =                                          \
+	$(ONTOLOGY_DIAGRAMS_PNG)                       \
 	ontology.png
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 #  Note that PNG files are also added in content_files so that
 #  the documentation is not built before the PNGs.
-content_files =								\
-	$(ONTOLOGY_INFOS_XML) 						\
-	$(HTML_IMAGES)							\
+content_files =                                        \
+	$(ONTOLOGY_INFOS_XML)                          \
+	$(HTML_IMAGES)                                 \
 	version.xml
 
 expand_content_files =
@@ -107,14 +107,14 @@ include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 # Note that HTML_FILES and content_files are already included
 #  by gtk-doc
-EXTRA_DIST += 								\
-	gen-doc.stamp							\
-	version.xml.in							\
-	$(ONTOLOGY_DIAGRAMS)						\
+EXTRA_DIST +=                                          \
+	gen-doc.stamp                                  \
+	version.xml.in                                 \
+	$(ONTOLOGY_DIAGRAMS)                           \
 	$(ONTOLOGY_EXPLANATIONS)
 
 # PNGs and XMLs generated are removed only in maintainer-clean
-MAINTAINERCLEANFILES = 							\
-	$(HTML_IMAGES)							\
-	$(ONTOLOGY_INFOS_XML) 						\
-	gen-doc.stamp
\ No newline at end of file
+MAINTAINERCLEANFILES =                                 \
+	$(HTML_IMAGES)                                 \
+	$(ONTOLOGY_INFOS_XML)                          \
+	gen-doc.stamp
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 713027f..48737ed 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -2,29 +2,29 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = ontology-graph ttl2sgml
 
-AM_CPPFLAGS = 								\
-	$(BUILD_CFLAGS)							\
-	-DTOP_SRCDIR=\"$(top_srcdir)\"					\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-DTOP_SRCDIR=\"$(top_srcdir)\"                 \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(LIBTRACKER_DATA_CFLAGS)
 
-LDADD =									\
-	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
+LDADD =                                                \
+	$(top_builddir)/src/libtracker-data/libtracker-data.la \
 	$(LIBTRACKER_DATA_LIBS)
 
-ontology_graph_SOURCES =						\
+ontology_graph_SOURCES =                               \
 	ontology-graph.c
 
-ttl2sgml_SOURCES =							\
-	ttl2sgml.c							\
-	ttl_loader.h							\
-	ttl_loader.c							\
-	ttl_model.h 							\
-	ttl_model.c							\
-	qname.h								\
-	qname.c								\
-	ttl_sgml.h							\
+ttl2sgml_SOURCES =                                     \
+	ttl2sgml.c                                     \
+	ttl_loader.h                                   \
+	ttl_loader.c                                   \
+	ttl_model.h                                    \
+	ttl_model.c                                    \
+	qname.h                                        \
+	qname.c                                        \
+	ttl_sgml.h                                     \
 	ttl_sgml.c
 
 EXTRA_DIST = gen-doc.sh
diff --git a/examples/Makefile.am b/examples/Makefile.am
index de2b2a9..0098884 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = 			\
-	libtracker-extract	\
-	libtracker-miner	\
-	rss-reader		\
+SUBDIRS =                                              \
+	libtracker-extract                             \
+	libtracker-miner                               \
+	rss-reader                                     \
 	class-signal
diff --git a/examples/class-signal/Makefile.am b/examples/class-signal/Makefile.am
index 5f4719f..6657faa 100644
--- a/examples/class-signal/Makefile.am
+++ b/examples/class-signal/Makefile.am
@@ -2,14 +2,14 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = class-signal
 
-AM_CPPFLAGS = 				\
-	$(BUILD_CFLAGS) 		\
-	-I$(top_srcdir)/src 		\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
 	$(LIBTRACKER_SPARQL_CFLAGS)
 
-LDADD = 			\
+LDADD =                                                \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(BUILD_LIBS) 			\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_SPARQL_LIBS)
 
 class_signal_SOURCES = class-signal.c
diff --git a/examples/libtracker-extract/Makefile.am b/examples/libtracker-extract/Makefile.am
index bf630ab..798c73c 100644
--- a/examples/libtracker-extract/Makefile.am
+++ b/examples/libtracker-extract/Makefile.am
@@ -3,19 +3,19 @@ include $(top_srcdir)/Makefile.decl
 module_flags = -module -avoid-version -no-undefined
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
 
-AM_CPPFLAGS = 								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src 						\
-	-I$(top_builddir)/src						\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(LIBTRACKER_EXTRACT_CFLAGS)
 
 noinst_LTLIBRARIES = libextract-mockup.la
 
 libextract_mockup_la_SOURCES = tracker-extract-mockup.c
 libextract_mockup_la_LDFLAGS = $(module_flags)
-libextract_mockup_la_LIBADD = 						\
+libextract_mockup_la_LIBADD =                          \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_EXTRACT_LIBS)
 
diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am
index ea724e8..36c430d 100644
--- a/examples/libtracker-miner/Makefile.am
+++ b/examples/libtracker-miner/Makefile.am
@@ -2,22 +2,22 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = tracker-miner-test
 
-AM_CPPFLAGS =							\
-	$(BUILD_CFLAGS)						\
-	-I$(top_srcdir)/src					\
-	-I$(top_builddir)/src					\
-	-DSHAREDIR=\""$(datadir)"\"				\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DSHAREDIR=\""$(datadir)"\"                    \
 	$(LIBTRACKER_MINER_CFLAGS)
 
-LDADD =  		                           		\
+LDADD =                                                \
        $(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
        $(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
        $(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
        $(top_builddir)/src/libtracker-common/libtracker-common.la \
-       $(BUILD_LIBS)                                   		\
+       $(BUILD_LIBS)                                   \
        $(LIBTRACKER_MINER_LIBS)
 
-tracker_miner_test_SOURCES =   					\
-	tracker-miner-test.c    				\
-	tracker-miner-test.h    				\
+tracker_miner_test_SOURCES =                           \
+	tracker-miner-test.c                           \
+	tracker-miner-test.h                           \
 	tracker-main.c
diff --git a/examples/rss-reader/Makefile.am b/examples/rss-reader/Makefile.am
index 28fd35c..04478ed 100644
--- a/examples/rss-reader/Makefile.am
+++ b/examples/rss-reader/Makefile.am
@@ -1,9 +1,9 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 				\
-	initial-data.ttl		\
-	rss_viewer.ui			\
-	main.py				\
-	signaler.py			\
-	tracker_backend.py		\
+EXTRA_DIST =                                           \
+	initial-data.ttl                               \
+	rss_viewer.ui                                  \
+	main.py                                        \
+	signaler.py                                    \
+	tracker_backend.py                             \
 	zeitgeist_backend.py
diff --git a/src/Makefile.am b/src/Makefile.am
index 640e0ec..3700191 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,25 +8,24 @@ if HAVE_TRACKER_FTS
 libtrackerfts_dir = libtracker-fts
 endif
 
-
-SUBDIRS = 					\
-	$(libstemmer_dir)			\
-	libtracker-common 			\
-	libtracker-sparql 			\
-	libtracker-client			\
-	$(libtrackerfts_dir)			\
-	libtracker-bus				\
-	libtracker-data				\
-	libtracker-direct			\
-	libtracker-extract			\
-	libtracker-miner			\
-	miners					\
-	plugins					\
-	tracker-store				\
-	tracker-control				\
-	tracker-utils				\
-	tracker-extract				\
-	tracker-writeback			\
+SUBDIRS =                                              \
+	$(libstemmer_dir)                              \
+	libtracker-common                              \
+	libtracker-sparql                              \
+	libtracker-client                              \
+	$(libtrackerfts_dir)                           \
+	libtracker-bus                                 \
+	libtracker-data                                \
+	libtracker-direct                              \
+	libtracker-extract                             \
+	libtracker-miner                               \
+	miners                                         \
+	plugins                                        \
+	tracker-store                                  \
+	tracker-control                                \
+	tracker-utils                                  \
+	tracker-extract                                \
+	tracker-writeback                              \
 	vapi
 
 if HAVE_TRACKER_PREFERENCES
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index 846e97b..d911d12 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -2,39 +2,39 @@ include $(top_srcdir)/Makefile.decl
 
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 
-AM_CPPFLAGS =						\
-	$(BUILD_CFLAGS)					\
-	-I$(top_srcdir)/src				\
-	-I$(top_builddir)/src				\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(LIBTRACKER_BUS_CFLAGS)
 
 modules_LTLIBRARIES = libtracker-bus.la
 
-libtracker_bus_la_VALASOURCES = 		\
-	tracker-bus.vala			\
+libtracker_bus_la_VALASOURCES =                        \
+	tracker-bus.vala                               \
 	tracker-array-cursor.vala
 
-libtracker_bus_la_SOURCES = 	\
-	libtracker-bus.vala.stamp			\
-	$(libtracker_bus_la_VALASOURCES:.vala=.c)	\
-	tracker-bus-fd-cursor.h				\
-	tracker-bus-fd-cursor.c				\
-	tracker-bus-fd-update.c				\
-	tracker-bus-fd-update.h				\
-	tracker-bus-shared.c				\
+libtracker_bus_la_SOURCES =                            \
+	libtracker-bus.vala.stamp                      \
+	$(libtracker_bus_la_VALASOURCES:.vala=.c)      \
+	tracker-bus-fd-cursor.h                        \
+	tracker-bus-fd-cursor.c                        \
+	tracker-bus-fd-update.c                        \
+	tracker-bus-fd-update.h                        \
+	tracker-bus-shared.c                           \
 	tracker-bus-shared.h
 
-libtracker_bus_la_LDFLAGS = 	\
+libtracker_bus_la_LDFLAGS =                            \
 	-module -avoid-version -no-undefined
 
-noinst_HEADERS = 			\
+noinst_HEADERS =                                       \
 	tracker-bus.h
 
 # Vala sources
-vapi_sources =						\
-	$(top_builddir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi 	\
-	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi 				\
-	tracker-bus-fd-cursor.vapi 			\
+vapi_sources =                                         \
+	$(top_builddir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
+	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
+	tracker-bus-fd-cursor.vapi                     \
 	tracker-bus-fd-update.vapi
 
 libtracker-bus.vala.stamp: $(libtracker_bus_la_VALASOURCES) $(vapi_sources)
@@ -43,22 +43,22 @@ libtracker-bus.vala.stamp: $(libtracker_bus_la_VALASOURCES) $(vapi_sources)
 
 BUILT_SOURCES = libtracker-bus.vala.stamp
 
-libtracker_bus_la_LIBADD = 				\
+libtracker_bus_la_LIBADD =                             \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS) 					\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_BUS_LIBS)
 
-MAINTAINERCLEANFILES =					\
-	$(libtracker_bus_la_VALASOURCES:.vala=.c) 	\
-	libtracker-bus.vala.stamp			\
-	tracker-bus.vapi				\
+MAINTAINERCLEANFILES =                                 \
+	$(libtracker_bus_la_VALASOURCES:.vala=.c)      \
+	libtracker-bus.vala.stamp                      \
+	tracker-bus.vapi                               \
 	tracker-bus.h
 
-EXTRA_DIST = 						\
-	$(libtracker_bus_la_VALASOURCES) \
-	libtracker-bus.vala.stamp \
-	tracker-bus.vapi \
-	tracker-bus-fd-cursor.vapi \
+EXTRA_DIST =                                           \
+	$(libtracker_bus_la_VALASOURCES)               \
+	libtracker-bus.vala.stamp                      \
+	tracker-bus.vapi                               \
+	tracker-bus-fd-cursor.vapi                     \
 	tracker-bus-fd-update.vapi
 
diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am
index 4e86c8e..4fbf389 100644
--- a/src/libtracker-client/Makefile.am
+++ b/src/libtracker-client/Makefile.am
@@ -1,10 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS = 						\
-	$(BUILD_CFLAGS)					\
-	-DLOCALEDIR=\""$(localedir)"\" 			\
-	-I$(top_srcdir)/src				\
-	-I$(top_builddir)/src				\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(LIBTRACKER_CLIENT_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-client- TRACKER_API_VERSION@.la
@@ -14,31 +14,31 @@ libtracker_clientincludedir = $(includedir)/tracker-$(TRACKER_API_VERSION)/libtr
 libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES = \
 	tracker-sparql-builder.vala
 
-libtracker_client_ TRACKER_API_VERSION@_la_SOURCES = 	\
-	tracker.c					\
-	tracker-client.h				\
-	tracker-sparql-builder.c			\
-	tracker-sparql-builder.h			\
-	libtracker-client.vala.stamp			\
+libtracker_client_ TRACKER_API_VERSION@_la_SOURCES =   \
+	tracker.c                                      \
+	tracker-client.h                               \
+	tracker-sparql-builder.c                       \
+	tracker-sparql-builder.h                       \
+	libtracker-client.vala.stamp                   \
 	$(libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES:.vala=.c)
 
-libtracker_client_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
+libtracker_client_ TRACKER_API_VERSION@_la_LDFLAGS =   \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-symbols-regex '^tracker_.*'
 
-libtracker_client_ TRACKER_API_VERSION@_la_LIBADD =	\
+libtracker_client_ TRACKER_API_VERSION@_la_LIBADD =    \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)					\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_CLIENT_LIBS)
 
-libtracker_clientinclude_HEADERS = 			\
-	tracker.h					\
-	tracker-client.h				\
+libtracker_clientinclude_HEADERS =                     \
+	tracker.h                                      \
+	tracker-client.h                               \
 	tracker-sparql-builder.h
 
 # Generate DBus files from XML data.
-dbus_sources = 						\
-	tracker-resources-glue.h			\
+dbus_sources =                                         \
+	tracker-resources-glue.h                       \
 	tracker-statistics-glue.h
 
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
@@ -46,35 +46,35 @@ dbus_sources = 						\
 
 # Vala bindings
 vapidir = $(datadir)/vala/vapi
-vapi_DATA =                     			\
+vapi_DATA =                                            \
 	tracker-client-$(TRACKER_API_VERSION).vapi
 
 tracker-client-$(TRACKER_API_VERSION).vapi: tracker-client.vapi
 	cp $< $@
 
 # Vala sources
-vapi_sources =						\
-	$(top_srcdir)/src/vapi/posix.vapi		\
+vapi_sources =                                         \
+	$(top_srcdir)/src/vapi/posix.vapi              \
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
 
 libtracker-client.vala.stamp: $(libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES) $(vapi_sources)
 	$(AM_V_GEN)$(VALAC) -C $(VALAFLAGS) --pkg gio-2.0 -H tracker-sparql-builder.h $^
 	$(AM_V_GEN)touch $@
 
-BUILT_SOURCES = 					\
-	$(dbus_sources)					\
+BUILT_SOURCES =                                        \
+	$(dbus_sources)                                \
 	libtracker-client.vala.stamp
 
-CLEANFILES = 						\
-	$(BUILT_SOURCES)				\
+CLEANFILES =                                           \
+	$(BUILT_SOURCES)                               \
 	$(vapi_DATA)
 
-MAINTAINERCLEANFILES =					\
+MAINTAINERCLEANFILES =                                 \
 	$(libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES:.vala=.c) \
-	libtracker-client.vala.stamp			\
+	libtracker-client.vala.stamp                   \
 	tracker-sparql-builder.h
 
-EXTRA_DIST = 						\
+EXTRA_DIST =                                           \
 	$(libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES) \
-	tracker-client.vapi				\
+	tracker-client.vapi                            \
 	libtracker-client.vala.stamp
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 6ebb9f2..4020384 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -1,9 +1,9 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =						\
-	$(BUILD_CFLAGS)					\
-	-I$(top_srcdir)/src				\
-	-DSHAREDIR=\""$(datadir)"\"			\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-DSHAREDIR=\""$(datadir)"\"                    \
 	$(LIBTRACKER_COMMON_CFLAGS)
 
 libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
@@ -17,85 +17,85 @@ endif
 
 # Prefer UPower for the power data if it's available, else fall back to HAL
 if HAVE_UPOWER
-power_headers =						\
+power_headers =                                        \
 	tracker-power.h
-power_sources =						\
+power_sources =                                        \
 	tracker-power-upower.c
 else
 if HAVE_HAL
-power_headers =						\
+power_headers =                                        \
 	tracker-power.h
-power_sources =						\
+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	 				\
-	tracker-file-utils.c				\
-	tracker-ioprio.c				\
-	tracker-keyfile-object.c			\
-	tracker-log.c	 				\
-	tracker-type-utils.c				\
-	tracker-utils.c					\
+libtracker_common_la_SOURCES =                         \
+	$(marshal_sources)                             \
+	$(os_sources)                                  \
+	$(power_sources)                               \
+	tracker-config-file.c                          \
+	tracker-date-time.c                            \
+	tracker-dbus.c                                 \
+	tracker-file-utils.c                           \
+	tracker-ioprio.c                               \
+	tracker-keyfile-object.c                       \
+	tracker-log.c                                  \
+	tracker-type-utils.c                           \
+	tracker-utils.c                                \
 	tracker-crc32.c
 
-noinst_HEADERS =					\
-	$(power_headers)				\
-	tracker-dbus.h					\
-	tracker-ioprio.h				\
-	tracker-log.h					\
-	tracker-os-dependant.h				\
-	tracker-config-file.h				\
-	tracker-common.h				\
-	tracker-date-time.h				\
-	tracker-file-utils.h				\
-	tracker-keyfile-object.h			\
-	tracker-ontologies.h				\
-	tracker-type-utils.h				\
-	tracker-utils.h					\
+noinst_HEADERS =                                       \
+	$(power_headers)                               \
+	tracker-dbus.h                                 \
+	tracker-ioprio.h                               \
+	tracker-log.h                                  \
+	tracker-os-dependant.h                         \
+	tracker-config-file.h                          \
+	tracker-common.h                               \
+	tracker-date-time.h                            \
+	tracker-file-utils.h                           \
+	tracker-keyfile-object.h                       \
+	tracker-ontologies.h                           \
+	tracker-type-utils.h                           \
+	tracker-utils.h                                \
 	tracker-crc32.h
 
 if HAVE_TRACKER_FTS
-libtracker_common_la_SOURCES +=	 			\
+libtracker_common_la_SOURCES +=                        \
 	tracker-language.c
-noinst_HEADERS +=					\
+noinst_HEADERS +=                                      \
 	tracker-language.h
 endif
 
-libtracker_common_la_LDFLAGS = 				\
+libtracker_common_la_LDFLAGS =                         \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-libtracker_common_la_LIBADD = 				\
-	$(BUILD_LIBS)					\
+libtracker_common_la_LIBADD =                          \
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_COMMON_LIBS)
 
 if HAVE_TRACKER_FTS
-libtracker_common_la_LIBADD += 				\
+libtracker_common_la_LIBADD +=                         \
 	$(top_builddir)/src/libstemmer/libstemmer.la
 endif
 
-marshal_sources =                              		\
-        tracker-marshal.h              			\
+marshal_sources =                                      \
+        tracker-marshal.h                              \
         tracker-marshal.c
 
 tracker-marshal.h: tracker-marshal.list
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
 
 tracker-marshal.c: tracker-marshal.list
-	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ &&	\
+	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ && \
 		   $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
 
 BUILT_SOURCES =	$(marshal_sources)
 
 CLEANFILES = $(marshal_sources)
 
-EXTRA_DIST = 						\
-	tracker-marshal.list				\
+EXTRA_DIST =                                           \
+	tracker-marshal.list                           \
 	libtracker-common.vapi
 
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index dfcda28..bba01ce 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -1,10 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
-	-DSHAREDIR=\""$(datadir)"\"					\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DSHAREDIR=\""$(datadir)"\"                    \
 	$(LIBTRACKER_DATA_CFLAGS)
 
 BUILT_SOURCES = libtracker-data.vala.stamp
@@ -12,86 +12,86 @@ BUILT_SOURCES = libtracker-data.vala.stamp
 libtracker_datadir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_data_LTLIBRARIES = libtracker-data.la
 
-libtracker_data_la_VALASOURCES = 					\
-	tracker-sparql-expression.vala					\
-	tracker-sparql-pattern.vala					\
-	tracker-sparql-query.vala					\
-	tracker-sparql-scanner.vala					\
+libtracker_data_la_VALASOURCES =                       \
+	tracker-sparql-expression.vala                 \
+	tracker-sparql-pattern.vala                    \
+	tracker-sparql-query.vala                      \
+	tracker-sparql-scanner.vala                    \
 	tracker-turtle-reader.vala
 
-libtracker_data_la_SOURCES = 						\
-	tracker-class.c							\
-	tracker-collation.c						\
-	tracker-data-backup.c						\
-	tracker-data-manager.c						\
-	tracker-data-query.c						\
-	tracker-data-update.c						\
-	tracker-db-config.c						\
-	tracker-db-dbus.c						\
-	tracker-db-interface.c						\
-	tracker-db-interface-sqlite.c					\
-	tracker-db-manager.c						\
-	tracker-db-journal.c						\
-	tracker-namespace.c						\
-	tracker-ontology.c						\
-	tracker-ontologies.c						\
-	tracker-property.c						\
-	libtracker-data.vala.stamp					\
+libtracker_data_la_SOURCES =                           \
+	tracker-class.c                                \
+	tracker-collation.c                            \
+	tracker-data-backup.c                          \
+	tracker-data-manager.c                         \
+	tracker-data-query.c                           \
+	tracker-data-update.c                          \
+	tracker-db-config.c                            \
+	tracker-db-dbus.c                              \
+	tracker-db-interface.c                         \
+	tracker-db-interface-sqlite.c                  \
+	tracker-db-manager.c                           \
+	tracker-db-journal.c                           \
+	tracker-namespace.c                            \
+	tracker-ontology.c                             \
+	tracker-ontologies.c                           \
+	tracker-property.c                             \
+	libtracker-data.vala.stamp                     \
 	$(libtracker_data_la_VALASOURCES:.vala=.c)
 
-noinst_HEADERS =							\
-	tracker-class.h							\
-	tracker-data.h							\
-	tracker-collation.h						\
-	tracker-data-backup.h						\
-	tracker-data-manager.h						\
-	tracker-data-query.h						\
-	tracker-data-update.h						\
-	tracker-db-config.h						\
-	tracker-db-dbus.h						\
-	tracker-db-interface.h						\
-	tracker-db-interface-sqlite.h					\
-	tracker-db-manager.h 						\
-	tracker-db-journal.h						\
-	tracker-namespace.h						\
-	tracker-ontology.h						\
-	tracker-ontologies.h						\
-	tracker-property.h						\
+noinst_HEADERS =                                       \
+	tracker-class.h                                \
+	tracker-data.h                                 \
+	tracker-collation.h                            \
+	tracker-data-backup.h                          \
+	tracker-data-manager.h                         \
+	tracker-data-query.h                           \
+	tracker-data-update.h                          \
+	tracker-db-config.h                            \
+	tracker-db-dbus.h                              \
+	tracker-db-interface.h                         \
+	tracker-db-interface-sqlite.h                  \
+	tracker-db-manager.h                           \
+	tracker-db-journal.h                           \
+	tracker-namespace.h                            \
+	tracker-ontology.h                             \
+	tracker-ontologies.h                           \
+	tracker-property.h                             \
 	tracker-sparql-query.h
 
-vapi_sources =								\
-	$(top_srcdir)/src/vapi/posix.vapi				\
-	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi			\
-	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi	\
-	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi	\
+vapi_sources =                                         \
+	$(top_srcdir)/src/vapi/posix.vapi              \
+	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi     \
+	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
+	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
 	libtracker-data.vapi
 
 libtracker-data.vala.stamp: $(libtracker_data_la_VALASOURCES) $(vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --includedir=libtracker-data -H tracker-sparql-query.h --vapi tracker-sparql-query.vapi --pkg gio-2.0 $^
 	touch $@
 
-libtracker_data_la_LDFLAGS =						\
+libtracker_data_la_LDFLAGS =                           \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
-libtracker_data_la_LIBADD = 						\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+libtracker_data_la_LIBADD =                            \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_DATA_LIBS)
 
 if HAVE_TRACKER_FTS
-libtracker_data_la_LIBADD += 						\
+libtracker_data_la_LIBADD +=                           \
 	$(top_builddir)/src/libtracker-fts/libtracker-fts.la
 endif
 
-MAINTAINERCLEANFILES =							\
-	libtracker-data.vala.stamp					\
-	$(libtracker_data_la_VALASOURCES:.vala=.c)			\
-	tracker-sparql-query.h						\
+MAINTAINERCLEANFILES =                                 \
+	libtracker-data.vala.stamp                     \
+	$(libtracker_data_la_VALASOURCES:.vala=.c)     \
+	tracker-sparql-query.h                         \
 	$(NULL)
 
-EXTRA_DIST = $(libtracker_data_la_VALASOURCES)				\
-	libtracker-data.vala.stamp					\
-	libtracker-data.vapi						\
+EXTRA_DIST = $(libtracker_data_la_VALASOURCES)         \
+	libtracker-data.vala.stamp                     \
+	libtracker-data.vapi                           \
 	tracker-sparql-query.vapi
 
diff --git a/src/libtracker-direct/Makefile.am b/src/libtracker-direct/Makefile.am
index 4e98a87..56d3ed1 100644
--- a/src/libtracker-direct/Makefile.am
+++ b/src/libtracker-direct/Makefile.am
@@ -1,30 +1,30 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =						\
-	$(BUILD_CFLAGS)					\
-	-I$(top_srcdir)/src				\
-	-I$(top_builddir)/src				\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(LIBTRACKER_DIRECT_CFLAGS)
 
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 
 modules_LTLIBRARIES = libtracker-direct.la
 
-libtracker_direct_la_VALASOURCES = 			\
+libtracker_direct_la_VALASOURCES =                     \
 	tracker-direct.vala
 
-libtracker_direct_la_SOURCES = 				\
-	libtracker-direct.vala.stamp			\
+libtracker_direct_la_SOURCES =                         \
+	libtracker-direct.vala.stamp                   \
 	$(libtracker_direct_la_VALASOURCES:.vala=.c)
 
-libtracker_direct_la_LDFLAGS = 				\
+libtracker_direct_la_LDFLAGS =                         \
 	-module -avoid-version -no-undefined
 
-noinst_HEADERS = 					\
+noinst_HEADERS =                                       \
 	tracker-direct.h
 
 # Vala sources
-vapi_sources =						\
+vapi_sources =                                         \
 	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
 	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
 	$(top_srcdir)/src/libtracker-data/libtracker-data.vapi \
@@ -36,18 +36,18 @@ libtracker-direct.vala.stamp: $(libtracker_direct_la_VALASOURCES) $(vapi_sources
 
 BUILT_SOURCES = libtracker-direct.vala.stamp
 
-libtracker_direct_la_LIBADD = 				\
-	$(top_builddir)/src/libtracker-data/libtracker-data.la	\
-	$(BUILD_LIBS)					\
+libtracker_direct_la_LIBADD =                          \
+	$(top_builddir)/src/libtracker-data/libtracker-data.la \
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_DIRECT_LIBS)
 
-MAINTAINERCLEANFILES =					\
-	$(libtracker_direct_la_VALASOURCES:.vala=.c) 	\
-	libtracker-direct.vala.stamp			\
-	tracker-direct.h				\
+MAINTAINERCLEANFILES =                                 \
+	$(libtracker_direct_la_VALASOURCES:.vala=.c)   \
+	libtracker-direct.vala.stamp                   \
+	tracker-direct.h                               \
 	tracker-direct.vapi
 
-EXTRA_DIST = 						\
-	$(libtracker_direct_la_VALASOURCES) 		\
-	libtracker-direct.vala.stamp			\
+EXTRA_DIST =                                           \
+	$(libtracker_direct_la_VALASOURCES)            \
+	libtracker-direct.vala.stamp                   \
 	tracker-direct.vapi
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index b5e3185..de9f2f5 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -1,42 +1,42 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =						\
-	$(BUILD_CFLAGS)					\
-	-I$(top_srcdir)/src				\
-	-I$(top_builddir)/src				\
-	-DSHAREDIR=\""$(datadir)"\"			\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DSHAREDIR=\""$(datadir)"\"                    \
 	$(LIBTRACKER_EXTRACT_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-extract- TRACKER_API_VERSION@.la
 
 libtracker_extractincdir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-extract/
 
-libtracker_extract_ TRACKER_API_VERSION@_la_SOURCES =	\
-	tracker-data.h					\
-	tracker-exif.c					\
-	tracker-exif.h					\
-	tracker-iptc.c					\
-	tracker-iptc.h					\
-	tracker-utils.c					\
-	tracker-xmp.c					\
+libtracker_extract_ TRACKER_API_VERSION@_la_SOURCES =  \
+	tracker-data.h                                 \
+	tracker-exif.c                                 \
+	tracker-exif.h                                 \
+	tracker-iptc.c                                 \
+	tracker-iptc.h                                 \
+	tracker-utils.c                                \
+	tracker-xmp.c                                  \
 	tracker-xmp.h
 
 noinst_HEADERS =
 
-libtracker_extractinc_HEADERS =				\
-	tracker-data.h					\
-	tracker-exif.h					\
-	tracker-extract.h				\
-	tracker-iptc.h					\
-	tracker-utils.h					\
+libtracker_extractinc_HEADERS =                        \
+	tracker-data.h                                 \
+	tracker-exif.h                                 \
+	tracker-extract.h                              \
+	tracker-iptc.h                                 \
+	tracker-utils.h                                \
 	tracker-xmp.h
 
-libtracker_extract_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
+libtracker_extract_ TRACKER_API_VERSION@_la_LDFLAGS =  \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-symbols-regex '^tracker_.*'
 
-libtracker_extract_ TRACKER_API_VERSION@_la_LIBADD = 	\
+libtracker_extract_ TRACKER_API_VERSION@_la_LIBADD =   \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)					\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_EXTRACT_LIBS)
diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
index 85c87b5..e10df9a 100644
--- a/src/libtracker-fts/Makefile.am
+++ b/src/libtracker-fts/Makefile.am
@@ -1,22 +1,22 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-DNDEBUG							\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-DNDEBUG                                       \
 	$(LIBTRACKER_FTS_CFLAGS)
 
 noinst_LTLIBRARIES = libtracker-fts.la
 
-libtracker_fts_la_SOURCES = 						\
-	tracker-fts.c							\
-	tracker-fts.h							\
-	tracker-fts-config.c						\
-	tracker-fts-config.h						\
-	tracker-fts-hash.c						\
-	tracker-fts-hash.h						\
-	tracker-parser-utils.c						\
-	tracker-parser-utils.h						\
+libtracker_fts_la_SOURCES =                            \
+	tracker-fts.c                                  \
+	tracker-fts.h                                  \
+	tracker-fts-config.c                           \
+	tracker-fts-config.h                           \
+	tracker-fts-hash.c                             \
+	tracker-fts-hash.h                             \
+	tracker-parser-utils.c                         \
+	tracker-parser-utils.h                         \
 	tracker-parser.h
 
 if BUILD_LIBUNISTRING_PARSER
@@ -29,7 +29,7 @@ else
 endif
 endif
 
-libtracker_fts_la_LIBADD =						\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+libtracker_fts_la_LIBADD =                             \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_FTS_LIBS)
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 8243ff6..0c71260 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -5,13 +5,13 @@ include $(top_srcdir)/Makefile.decl
 #  $(libtracker_miner_monitor_sources)
 include Makefile-shared-sources.decl
 
-AM_CPPFLAGS =						\
-	$(BUILD_CFLAGS)					\
-	-I$(top_srcdir)/src				\
-	-I$(top_builddir)/src				\
-	-DSHAREDIR=\""$(datadir)"\"			\
-	-DDBUS_SERVICES_DIR=\""$(DBUS_SERVICES_DIR)"\"	\
-	-DTRACKER_MINERS_DIR=\""$(datadir)/tracker/miners"\" 	\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DSHAREDIR=\""$(datadir)"\"                    \
+	-DDBUS_SERVICES_DIR=\""$(DBUS_SERVICES_DIR)"\" \
+	-DTRACKER_MINERS_DIR=\""$(datadir)/tracker/miners"\" \
 	$(LIBTRACKER_MINER_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-miner- TRACKER_API_VERSION@.la
@@ -19,47 +19,47 @@ lib_LTLIBRARIES = libtracker-miner- TRACKER_API_VERSION@.la
 libtracker_minerdir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_minerincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-miner/
 
-libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES = 	\
-	$(libtracker_miner_marshal_sources)		\
-	$(libtracker_miner_monitor_sources)		\
-	tracker-crawler.c				\
-	tracker-dbus.c					\
-	tracker-dbus.h					\
-	tracker-miner-dbus.h 				\
-	tracker-miner-object.c				\
-	tracker-miner-fs.c				\
-	tracker-miner-fs-processing-pool.h		\
-	tracker-miner-fs-processing-pool.c		\
-	tracker-miner-manager.c				\
-	tracker-miner-web.c				\
-	tracker-miner-web-dbus.h			\
-	tracker-network-provider.c			\
-	tracker-password-provider.c			\
-	tracker-storage.c				\
-	tracker-thumbnailer.c				\
-	tracker-utils.c					\
+libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES =    \
+	$(libtracker_miner_marshal_sources)            \
+	$(libtracker_miner_monitor_sources)            \
+	tracker-crawler.c                              \
+	tracker-dbus.c                                 \
+	tracker-dbus.h                                 \
+	tracker-miner-dbus.h                           \
+	tracker-miner-object.c                         \
+	tracker-miner-fs.c                             \
+	tracker-miner-fs-processing-pool.h             \
+	tracker-miner-fs-processing-pool.c             \
+	tracker-miner-manager.c                        \
+	tracker-miner-web.c                            \
+	tracker-miner-web-dbus.h                       \
+	tracker-network-provider.c                     \
+	tracker-password-provider.c                    \
+	tracker-storage.c                              \
+	tracker-thumbnailer.c                          \
+	tracker-utils.c                                \
 	tracker-utils.h
 
-libtracker_minerinclude_HEADERS = 			\
-	tracker-crawler.h				\
-	tracker-miner.h					\
-	tracker-miner-object.h 				\
-	tracker-miner-fs.h				\
-	tracker-miner-manager.h				\
-	tracker-miner-web.h				\
-	tracker-network-provider.h			\
-	tracker-password-provider.h			\
-	tracker-storage.h				\
+libtracker_minerinclude_HEADERS =                      \
+	tracker-crawler.h                              \
+	tracker-miner.h                                \
+	tracker-miner-object.h                         \
+	tracker-miner-fs.h                             \
+	tracker-miner-manager.h                        \
+	tracker-miner-web.h                            \
+	tracker-network-provider.h                     \
+	tracker-password-provider.h                    \
+	tracker-storage.h                              \
 	tracker-thumbnailer.h
 
-libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
+libtracker_miner_ TRACKER_API_VERSION@_la_LDFLAGS =    \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-symbols-regex '^tracker_(miner|thumbnailer|crawler|storage|password_provider|network_provider)_.*'
 
-libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD = 	\
+libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD =     \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)					\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_MINER_LIBS)
 
 if HAVE_GNOME_KEYRING
@@ -82,10 +82,10 @@ $(top_builddir)/src/libtracker-miner/tracker-marshal.c: tracker-marshal.list
 		    $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body) > $@
 
 # Generate DBus files from XML data.
-dbus_sources = 						\
-	tracker-miner-glue.h				\
-	tracker-miner-web-glue.h			\
-	tracker-miner-files-index-client.h		\
+dbus_sources =                                         \
+	tracker-miner-glue.h                           \
+	tracker-miner-web-glue.h                       \
+	tracker-miner-files-index-client.h             \
 	tracker-miner-client.h
 
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
@@ -96,8 +96,8 @@ dbus_sources = 						\
 
 # Vala bindings
 vapidir = $(datadir)/vala/vapi
-vapi_DATA =                     			\
-	tracker-miner-$(TRACKER_API_VERSION).vapi	\
+vapi_DATA =                                            \
+	tracker-miner-$(TRACKER_API_VERSION).vapi      \
 	tracker-miner-$(TRACKER_API_VERSION).deps
 
 tracker-miner-$(TRACKER_API_VERSION).vapi: tracker-miner.vapi
@@ -119,17 +119,17 @@ tracker-miner-web-glue.h: $(top_srcdir)/data/dbus/tracker-miner-web.xml $(top_sr
 
 tracker-miner-web-full.xml: tracker-miner-web-glue.h
 
-BUILT_SOURCES = 					\
-	$(dbus_sources) 				\
-	$(libtracker_miner_marshal_sources) 		\
+BUILT_SOURCES =                                        \
+	$(dbus_sources)                                \
+	$(libtracker_miner_marshal_sources)            \
 	$(vapi_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = tracker-miner-web-full.xml
 
-EXTRA_DIST = 						\
-	tracker-marshal.list				\
-	tracker-miner.vapi				\
-	tracker-miner.deps				\
+EXTRA_DIST =                                           \
+	tracker-marshal.list                           \
+	tracker-miner.vapi                             \
+	tracker-miner.deps                             \
 	tracker-miner-web-full.xml
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index b25ca6f..4ee23bd 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -2,41 +2,41 @@ include $(top_srcdir)/Makefile.decl
 
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-DSPARQL_MODULES_DIR=\""$(modulesdir)"\" 			\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-DSPARQL_MODULES_DIR=\""$(modulesdir)"\"       \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(LIBTRACKER_SPARQL_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-sparql- TRACKER_API_VERSION@.la
 
 libtracker_sparqlincludedir = $(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-sparql
 
-libtracker_sparql_la_VALASOURCES = 					\
-	tracker-builder.vala						\
-	tracker-connection.vala						\
-	tracker-cursor.vala						\
-	tracker-backend.vala						\
+libtracker_sparql_la_VALASOURCES =                     \
+	tracker-builder.vala                           \
+	tracker-connection.vala                        \
+	tracker-cursor.vala                            \
+	tracker-backend.vala                           \
 	tracker-utils.vala
 
-libtracker_sparql_ TRACKER_API_VERSION@_la_SOURCES = 			\
-	libtracker-sparql.vala.stamp					\
-	$(libtracker_sparql_la_VALASOURCES:.vala=.c) 			\
+libtracker_sparql_ TRACKER_API_VERSION@_la_SOURCES =   \
+	libtracker-sparql.vala.stamp                   \
+	$(libtracker_sparql_la_VALASOURCES:.vala=.c)   \
 	tracker-uri.c
 
-libtracker_sparql_ TRACKER_API_VERSION@_la_LDFLAGS = 			\
+libtracker_sparql_ TRACKER_API_VERSION@_la_LDFLAGS =   \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 #	-export-symbols-regex '^tracker_.*'
 
-libtracker_sparqlinclude_HEADERS = 					\
+libtracker_sparqlinclude_HEADERS =                     \
 	tracker-sparql.h
 
 # Vala sources
-vapi_sources =								\
-	config.vapi							\
-	$(top_srcdir)/src/vapi/posix.vapi				\
+vapi_sources =                                         \
+	config.vapi                                    \
+	$(top_srcdir)/src/vapi/posix.vapi              \
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
 
 libtracker-sparql.vala.stamp: $(libtracker_sparql_la_VALASOURCES) $(vapi_sources)
@@ -50,25 +50,25 @@ BUILT_SOURCES = libtracker-sparql.vala.stamp
 
 # Vala bindings
 vapidir = $(datadir)/vala/vapi
-vapi_DATA =						\
-	tracker-sparql-$(TRACKER_API_VERSION).vapi	\
+vapi_DATA =                                            \
+	tracker-sparql-$(TRACKER_API_VERSION).vapi     \
 	tracker-sparql-$(TRACKER_API_VERSION).deps
 
-libtracker_sparql_ TRACKER_API_VERSION@_la_LIBADD = 	\
-	$(BUILD_LIBS)					\
+libtracker_sparql_ TRACKER_API_VERSION@_la_LIBADD =    \
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_SPARQL_LIBS)
 
-MAINTAINERCLEANFILES =					\
-	$(libtracker_sparql_la_VALASOURCES:.vala=.c) 	\
-	libtracker-sparql.vala.stamp			\
-	tracker-sparql-$(TRACKER_API_VERSION).vapi	\
-	tracker-sparql-$(TRACKER_API_VERSION).deps	\
+MAINTAINERCLEANFILES =                                 \
+	$(libtracker_sparql_la_VALASOURCES:.vala=.c)   \
+	libtracker-sparql.vala.stamp                   \
+	tracker-sparql-$(TRACKER_API_VERSION).vapi     \
+	tracker-sparql-$(TRACKER_API_VERSION).deps     \
 	tracker-sparql.h
 
-EXTRA_DIST = 						\
-	config.vapi 					\
-	$(libtracker_sparql_la_VALASOURCES) 		\
-	libtracker-sparql.vala.stamp			\
-	tracker-sparql-$(TRACKER_API_VERSION).vapi	\
-	tracker-sparql.deps				\
+EXTRA_DIST =                                           \
+	config.vapi                                    \
+	$(libtracker_sparql_la_VALASOURCES)            \
+	libtracker-sparql.vala.stamp                   \
+	tracker-sparql-$(TRACKER_API_VERSION).vapi     \
+	tracker-sparql.deps                            \
 	tracker-sparql-$(TRACKER_API_VERSION).deps
diff --git a/src/miners/flickr/Makefile.am b/src/miners/flickr/Makefile.am
index 6198632..186756e 100644
--- a/src/miners/flickr/Makefile.am
+++ b/src/miners/flickr/Makefile.am
@@ -1,56 +1,55 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-DSHAREDIR=\""$(datadir)"\"					\
-	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-DSHAREDIR=\""$(datadir)"\"                    \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-DLIBEXEC_PATH=\""$(libexecdir)"\"             \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(TRACKER_MINER_FLICKR_CFLAGS)
 
-VALAFLAGS =								\
-	--pkg gio-2.0							\
-	--pkg rest-0.6							\
-	--pkg posix							\
+VALAFLAGS =                                            \
+	--pkg gio-2.0                                  \
+	--pkg rest-0.6                                 \
+	--pkg posix                                    \
 	--thread
 
 libexec_PROGRAMS = tracker-miner-flickr
 
-tracker_miner_flickr_VALASOURCES =					\
-	$(top_srcdir)/src/libtracker-sparql/tracker-sparql- TRACKER_API_VERSION@.vapi		\
+tracker_miner_flickr_VALASOURCES =                     \
+	$(top_srcdir)/src/libtracker-sparql/tracker-sparql- TRACKER_API_VERSION@.vapi \
 	tracker-miner-flickr.vala
 
-tracker_miner_flickr_SOURCES =						\
-	tracker-miner-flickr.vala.stamp                                 \
-	$(tracker_miner_flickr_VALASOURCES:.vala=.c)			\
-	tracker-writeback.c						\
+tracker_miner_flickr_SOURCES =                         \
+	tracker-miner-flickr.vala.stamp                \
+	$(tracker_miner_flickr_VALASOURCES:.vala=.c)   \
+	tracker-writeback.c                            \
 	tracker-writeback.h
 
-tracker_miner_flickr_LDADD =						\
+tracker_miner_flickr_LDADD =                           \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_FLICKR_LIBS)
 
-vapi_sources =								\
+vapi_sources =                                         \
 	$(top_srcdir)/src/libtracker-miner/tracker-miner.vapi
 
 tracker-miner-flickr.vala.stamp: $(tracker_miner_flickr_VALASOURCES) $(vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) $^
 	$(AM_V_GEN)touch $@
 
-
-BUILT_SOURCES = 							\
+BUILT_SOURCES =                                        \
 	tracker-miner-flickr.vala.stamp
 
-CLEANFILES =								\
+CLEANFILES =                                           \
 	$(BUILT_SOURCES)
 
-MAINTAINERCLEANFILES =							\
-	$(tracker_miner_flickr_VALASOURCES:.vala=.c)			\
+MAINTAINERCLEANFILES =                                 \
+	$(tracker_miner_flickr_VALASOURCES:.vala=.c)   \
 	tracker-miner-flickr.vala.stamp
 
-EXTRA_DIST =								\
-	$(tracker_miner_flickr_VALASOURCES)				\
+EXTRA_DIST =                                           \
+	$(tracker_miner_flickr_VALASOURCES)            \
 	tracker-miner-flickr.vala.stamp
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 3c937d7..5cc14ba 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -1,55 +1,55 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
-	-DSHAREDIR=\""$(datadir)"\"					\
-	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DSHAREDIR=\""$(datadir)"\"                    \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-DLIBEXEC_PATH=\""$(libexecdir)"\"             \
 	$(TRACKER_MINER_FS_CFLAGS)
 
 libexec_PROGRAMS = tracker-miner-fs
 
-tracker_miner_fs_SOURCES =						\
-	tracker-config.c						\
-	tracker-config.h						\
-	tracker-dbus.c							\
-	tracker-dbus.h							\
-	tracker-main.c							\
-	tracker-miner-applications.c					\
-	tracker-miner-applications.h					\
-	tracker-miner-files.c						\
-	tracker-miner-files.h						\
-	tracker-miner-files-index.c					\
+tracker_miner_fs_SOURCES =                             \
+	tracker-config.c                               \
+	tracker-config.h                               \
+	tracker-dbus.c                                 \
+	tracker-dbus.h                                 \
+	tracker-main.c                                 \
+	tracker-miner-applications.c                   \
+	tracker-miner-applications.h                   \
+	tracker-miner-files.c                          \
+	tracker-miner-files.h                          \
+	tracker-miner-files-index.c                    \
 	tracker-miner-files-index.h
 
-tracker_miner_fs_LDADD =						\
-	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
+tracker_miner_fs_LDADD =                               \
+	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-data/libtracker-data.la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_FS_LIBS)
 
 if HAVE_MEEGOTOUCH
 tracker_miner_fs_SOURCES += tracker-miner-applications-meego.cpp
 endif
 
-marshal_sources =							\
-	tracker-marshal.h						\
+marshal_sources =                                      \
+	tracker-marshal.h                              \
 	tracker-marshal.c
 
-dbus_sources = 								\
-	tracker-miner-glue.h						\
-	tracker-miner-files-index-glue.h				\
+dbus_sources =                                         \
+	tracker-miner-glue.h                           \
+	tracker-miner-files-index-glue.h               \
 	tracker-extract-client.h
 
 tracker-marshal.h: tracker-marshal.list
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
 
 tracker-marshal.c: tracker-marshal.list
-	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ &&	\
+	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ && \
 		   $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
 
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
@@ -58,8 +58,8 @@ tracker-marshal.c: tracker-marshal.list
 %-client.h: $(top_srcdir)/data/dbus/%.xml
 	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = 							\
-	$(marshal_sources)						\
+BUILT_SOURCES =                                        \
+	$(marshal_sources)                             \
 	$(dbus_sources)
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index edc8fc7..c752cec 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -1,24 +1,24 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-DSHAREDIR=\""$(datadir)"\"					\
-	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-DSHAREDIR=\""$(datadir)"\"                    \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-DLIBEXEC_PATH=\""$(libexecdir)"\"             \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(TRACKER_MINER_RSS_CFLAGS)
 
 libexec_PROGRAMS = tracker-miner-rss
 
-tracker_miner_rss_SOURCES =						\
-	tracker-main.c							\
-	tracker-miner-rss.h						\
+tracker_miner_rss_SOURCES =                            \
+	tracker-main.c                                 \
+	tracker-miner-rss.h                            \
 	tracker-miner-rss.c
 
-tracker_miner_rss_LDADD =						\
+tracker_miner_rss_LDADD =                              \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_RSS_LIBS)
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index efd3c07..66e0b1a 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -1,20 +1,20 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
-	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""			\
-	-DLOCALEDIR="\"$(localedir)\""					\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""     \
+	-DLOCALEDIR="\"$(localedir)\""                 \
 	$(TRACKER_MINER_EVOLUTION_CFLAGS)
 
 %.eplug.in: %.eplug.xml
 	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
 
 %.eplug: %.eplug.in
-	sed -e "s|+PLUGIN_INSTALL_DIR+|$(TRACKER_MINER_EVOLUTION_INSTALL_DIR)|"	\
-	    -e "s|+GETTEXT_PACKAGE+|$(GETTEXT_PACKAGE)|"			\
-	    -e "s|+LOCALEDIR+|$(localedir)|"					\
+	sed -e "s|+PLUGIN_INSTALL_DIR+|$(TRACKER_MINER_EVOLUTION_INSTALL_DIR)|" \
+	    -e "s|+GETTEXT_PACKAGE+|$(GETTEXT_PACKAGE)|" \
+	    -e "s|+LOCALEDIR+|$(localedir)|"           \
 	    $< > $@
 
 eplugindir = $(TRACKER_MINER_EVOLUTION_INSTALL_DIR)
@@ -25,16 +25,16 @@ eplugin_LTLIBRARIES = liborg-freedesktop-Tracker-evolution-plugin.la
 
 # module_flags = -module -avoid-version -no-undefined
 
-liborg_freedesktop_Tracker_evolution_plugin_la_SOURCES = 		\
-	tracker-evolution-plugin.c 			 		\
+liborg_freedesktop_Tracker_evolution_plugin_la_SOURCES = \
+	tracker-evolution-plugin.c                     \
 	tracker-evolution-plugin.h
 
 liborg_freedesktop_Tracker_evolution_plugin_la_LDFLAGS = -module -avoid-version
-liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = 		\
+liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_EVOLUTION_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
@@ -42,12 +42,12 @@ liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = 		\
 %-glue.h: %.xml
 	$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = 							\
+BUILT_SOURCES =                                        \
 	$(eplugin_DATA)
 
-CLEANFILES = 								\
-	$(BUILT_SOURCES) 						\
+CLEANFILES =                                           \
+	$(BUILT_SOURCES)                               \
 	$(eplugin_DATA)
 
-EXTRA_DIST =								\
+EXTRA_DIST =                                           \
 	org-freedesktop-Tracker-evolution-plugin.eplug.xml
diff --git a/src/plugins/nautilus/Makefile.am b/src/plugins/nautilus/Makefile.am
index 18274ce..c1e34b8 100644
--- a/src/plugins/nautilus/Makefile.am
+++ b/src/plugins/nautilus/Makefile.am
@@ -1,24 +1,24 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =											\
-	$(BUILD_CFLAGS)										\
-	-I$(top_srcdir)/src									\
-	-I$(top_builddir)/src									\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(TRACKER_NAUTILUS_EXTENSION_CFLAGS)
 
 nautilus_extensiondir = $(TRACKER_NAUTILUS_EXTENSION_INSTALL_DIR)
 
 nautilus_extension_LTLIBRARIES = libnautilus-tracker-tags.la
 
-libnautilus_tracker_tags_la_SOURCES =								\
-	tracker-tags-extension.c								\
-	tracker-tags-utils.c									\
-	tracker-tags-utils.h									\
-	tracker-tags-view.c									\
+libnautilus_tracker_tags_la_SOURCES =                  \
+	tracker-tags-extension.c                       \
+	tracker-tags-utils.c                           \
+	tracker-tags-utils.h                           \
+	tracker-tags-view.c                            \
 	tracker-tags-view.h
 
 libnautilus_tracker_tags_la_LDFLAGS = -module -avoid-version
-libnautilus_tracker_tags_la_LIBADD =								\
-	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la	\
-	$(BUILD_LIBS)										\
+libnautilus_tracker_tags_la_LIBADD =                   \
+	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_NAUTILUS_EXTENSION_LIBS)
diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am
index 5bc6d5c..be65013 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -1,33 +1,33 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(TRACKER_CONTROL_CFLAGS)
 
 bin_PROGRAMS = tracker-control
 
-tracker_control_SOURCES = 						\
-	$(dbus_sources)							\
+tracker_control_SOURCES =                              \
+	$(dbus_sources)                                \
 	tracker-control.c
 
-tracker_control_LDADD =							\
-	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
+tracker_control_LDADD =                                \
+	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-data/libtracker-data.la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_CONTROL_LIBS)
 
-dbus_sources = 								\
+dbus_sources =                                         \
 	tracker-miner-files-index-client.h
 
 %-client.h: $(top_srcdir)/data/dbus/%.xml
 	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = 							\
+BUILT_SOURCES =                                        \
 	$(dbus_sources)
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/tracker-explorer/Makefile.am b/src/tracker-explorer/Makefile.am
index 8e5d0f8..82c08d2 100644
--- a/src/tracker-explorer/Makefile.am
+++ b/src/tracker-explorer/Makefile.am
@@ -2,38 +2,38 @@ include $(top_srcdir)/Makefile.decl
 
 bin_PROGRAMS = tracker-explorer
 
-tracker_explorer_VALASOURCES = 					\
+tracker_explorer_VALASOURCES =                         \
 	tracker-explorer.vala
 
-tracker_explorer_SOURCES = 					\
+tracker_explorer_SOURCES =                             \
 	$(tracker_explorer_VALASOURCES:.vala=.c)
 
 tracker_explorer.vala.stamp: $(tracker_explorer_VALASOURCES)
 	$(VALAC) -C -g --pkg dbus-glib-1 --pkg gee-1.0 --pkg gtk+-2.0 $^
 	touch tracker_explorer.vala.stamp
 
-tracker_explorer_CFLAGS = 					\
-	$(BUILD_CFLAGS)						\
-	-DTRACKER_UI_DIR=\"$(datadir)/tracker/\"		\
-	-DSRCDIR=\"$(abs_srcdir)/\"				\
+tracker_explorer_CFLAGS =                              \
+	$(BUILD_CFLAGS)                                \
+	-DTRACKER_UI_DIR=\"$(datadir)/tracker/\"       \
+	-DSRCDIR=\"$(abs_srcdir)/\"                    \
 	$(TRACKER_EXPLORER_CFLAGS)
 
-tracker_explorer_LDADD = 					\
-	$(BUILD_LIBS)						\
+tracker_explorer_LDADD =                               \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_EXPLORER_LIBS)
 
 uidir = $(datadir)/tracker
 ui_DATA = tracker-explorer.ui
 
-EXTRA_DIST = 							\
-	$(tracker_explorer_VALASOURCES) 			\
-	$(ui_DATA)						\
+EXTRA_DIST =                                           \
+	$(tracker_explorer_VALASOURCES)                \
+	$(ui_DATA)                                     \
 	tracker_explorer.vala.stamp
 
-MAINTAINERCLEANFILES = 						\
-	tracker_explorer.vala.stamp 				\
+MAINTAINERCLEANFILES =                                 \
+	tracker_explorer.vala.stamp                    \
 	$(tracker_explorer_VALASOURCES:.vala=.c)
 
-BUILT_SOURCES = 						\
+BUILT_SOURCES =                                        \
 	tracker_explorer.vala.stamp
 
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index ef267c5..af5adc3 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -3,22 +3,22 @@ include $(top_srcdir)/Makefile.decl
 module_flags = -module -avoid-version -no-undefined
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
 
-AM_CPPFLAGS = 								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src 						\
-	-I$(top_builddir)/src						\
-	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DTRACKER_EXTRACTORS_DIR=\"$(modulesdir)\"			\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-DTRACKER_EXTRACTORS_DIR=\"$(modulesdir)\"     \
 	$(TRACKER_EXTRACT_CFLAGS)
 
 # NOTE:
 # We don't always link with libtracker-common, we only link
 # against it if we directly use functions in the .so
-modules_LTLIBRARIES = 							\
-	libextract-abw.la 						\
-	libextract-mp3.la				 		\
-	libextract-png.la 						\
-	libextract-ps.la 						\
+modules_LTLIBRARIES =                                  \
+	libextract-abw.la                              \
+	libextract-mp3.la                              \
+	libextract-png.la                              \
+	libextract-ps.la                               \
 	libextract-text.la
 
 if HAVE_LIBVORBIS
@@ -50,8 +50,8 @@ modules_LTLIBRARIES += libextract-html.la
 endif
 
 if HAVE_LIBGSF
-modules_LTLIBRARIES += 							\
-	libextract-msoffice.la						\
+modules_LTLIBRARIES +=                                 \
+	libextract-msoffice.la                         \
 	libextract-oasis.la
 endif
 
@@ -76,7 +76,7 @@ modules_LTLIBRARIES += libextract-xine.la
 endif
 
 if USING_EXTERNAL_VIDEO_PLAYER
-modules_LTLIBRARIES +=	libextract-mplayer.la 				\
+modules_LTLIBRARIES +=	libextract-mplayer.la           \
 			libextract-totem.la
 endif
 
@@ -87,19 +87,19 @@ endif
 # ABW
 libextract_abw_la_SOURCES = tracker-extract-abw.c
 libextract_abw_la_LDFLAGS = $(module_flags)
-libextract_abw_la_LIBADD = 						\
+libextract_abw_la_LIBADD =                             \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_EXTRACT_LIBS)
 
 # MP3
 libextract_mp3_la_SOURCES = tracker-extract-mp3.c
 libextract_mp3_la_LDFLAGS = $(module_flags)
-libextract_mp3_la_LIBADD = 						\
+libextract_mp3_la_LIBADD =                             \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_EXTRACT_LIBS)
 
 if HAVE_ENCA
@@ -110,201 +110,201 @@ endif
 # Vorbis (OGG)
 libextract_vorbis_la_SOURCES = tracker-extract-vorbis.c $(escape_sources)
 libextract_vorbis_la_LDFLAGS = $(module_flags)
-libextract_vorbis_la_LIBADD = 						\
+libextract_vorbis_la_LIBADD =                          \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(LIBVORBIS_LIBS)
 
 # Flac
 libextract_flac_la_SOURCES = tracker-extract-flac.c $(escape_sources)
 libextract_flac_la_LDFLAGS = $(module_flags)
-libextract_flac_la_LIBADD =						\
+libextract_flac_la_LIBADD =                            \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(LIBFLAC_LIBS)
 
 # MPlayer
 libextract_mplayer_la_SOURCES = tracker-extract-mplayer.c
 libextract_mplayer_la_LDFLAGS = $(module_flags)
-libextract_mplayer_la_LIBADD = 						\
+libextract_mplayer_la_LIBADD =                         \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_EXTRACT_LIBS)
 
 # Oasis
 libextract_oasis_la_SOURCES = tracker-extract-oasis.c
 libextract_oasis_la_CFLAGS = $(LIBGSF_CFLAGS)
 libextract_oasis_la_LDFLAGS = $(module_flags)
-libextract_oasis_la_LIBADD = 						\
+libextract_oasis_la_LIBADD =                           \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(LIBGSF_LIBS)
 
 # PNG
 libextract_png_la_SOURCES = tracker-extract-png.c
 libextract_png_la_CFLAGS = $(LIBPNG_CFLAGS)
 libextract_png_la_LDFLAGS = $(module_flags)
-libextract_png_la_LIBADD = 						\
+libextract_png_la_LIBADD =                             \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(LIBPNG_LIBS)
 
 # PS
 libextract_ps_la_SOURCES = tracker-extract-ps.c
 libextract_ps_la_LDFLAGS = $(module_flags)
-libextract_ps_la_LIBADD = 						\
+libextract_ps_la_LIBADD =                              \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_EXTRACT_LIBS)
 
 # Totem
 libextract_totem_la_SOURCES = tracker-extract-totem.c
 libextract_totem_la_LDFLAGS = $(module_flags)
-libextract_totem_la_LIBADD = 						\
+libextract_totem_la_LIBADD =                           \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_EXTRACT_LIBS)
 
 # XMP
 libextract_xmp_la_SOURCES = tracker-extract-xmp.c
 libextract_xmp_la_LDFLAGS = $(module_flags)
-libextract_xmp_la_LIBADD = 						\
+libextract_xmp_la_LIBADD =                             \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_EXTRACT_LIBS)
 
 # HTML
 libextract_html_la_SOURCES = tracker-extract-html.c
 libextract_html_la_CFLAGS = $(LIBXML2_CFLAGS)
 libextract_html_la_LDFLAGS = $(module_flags)
-libextract_html_la_LIBADD = 						\
+libextract_html_la_LIBADD =                            \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(LIBXML2_LIBS)
 
 # MS Office
 libextract_msoffice_la_SOURCES = tracker-extract-msoffice.c
 libextract_msoffice_la_CFLAGS = $(LIBGSF_CFLAGS)
 libextract_msoffice_la_LDFLAGS = $(module_flags)
-libextract_msoffice_la_LIBADD = 					\
+libextract_msoffice_la_LIBADD =                        \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(LIBGSF_LIBS)
 
 # PDF
 libextract_pdf_la_SOURCES = tracker-extract-pdf.cpp
 libextract_pdf_la_CXXFLAGS = $(POPPLER_CFLAGS)
 libextract_pdf_la_LDFLAGS = $(module_flags)
-libextract_pdf_la_LIBADD = 						\
+libextract_pdf_la_LIBADD =                             \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(POPPLER_LIBS)
 
 # GStreamer
 libextract_gstreamer_la_SOURCES = tracker-extract-gstreamer.c
 libextract_gstreamer_la_CFLAGS = $(GSTREAMER_CFLAGS)
 libextract_gstreamer_la_LDFLAGS = $(module_flags)
-libextract_gstreamer_la_LIBADD = 					\
+libextract_gstreamer_la_LIBADD =                       \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(GSTREAMER_LIBS)
 
 # GStreamer helix
 libextract_gstreamer_helix_la_SOURCES = tracker-extract-gstreamer-helix.c
 libextract_gstreamer_helix_la_CFLAGS = $(GSTREAMER_CFLAGS)
 libextract_gstreamer_helix_la_LDFLAGS = $(module_flags) $(albumart_flags)
-libextract_gstreamer_helix_la_LIBADD = 					\
+libextract_gstreamer_helix_la_LIBADD =                 \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(GSTREAMER_LIBS)
 
 # GUPnP DLNA
 libextract_gupnp_dlna_la_SOURCES = tracker-extract-gupnp-dlna.c
 libextract_gupnp_dlna_la_CFLAGS = $(GSTREAMER_CFLAGS) $(GUPNP_DLNA_CFLAGS)
 libextract_gupnp_dlna_la_LDFLAGS = $(module_flags) $(albumart_flags)
-libextract_gupnp_dlna_la_LIBADD = 					\
+libextract_gupnp_dlna_la_LIBADD =                      \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(GUPNP_DLNA_LIBS)
 
 # Xine
 libextract_xine_la_SOURCES = tracker-extract-libxine.c
 libextract_xine_la_CFLAGS = $(XINE_CFLAGS)
 libextract_xine_la_LDFLAGS = $(module_flags)
-libextract_xine_la_LIBADD = 						\
+libextract_xine_la_LIBADD =                            \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(XINE_LIBS)
 
 # GIF
 libextract_gif_la_SOURCES = tracker-extract-gif.c
 libextract_gif_la_CFLAGS = $(LIBGIF_CFLAGS)
 libextract_gif_la_LDFLAGS = $(module_flags)
-libextract_gif_la_LIBADD = 						\
+libextract_gif_la_LIBADD =                             \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(LIBGIF_LIBS)
 
 # JPEG
 libextract_jpeg_la_SOURCES = tracker-extract-jpeg.c
 libextract_jpeg_la_CFLAGS = $(LIBJPEG_CFLAGS)
 libextract_jpeg_la_LDFLAGS = $(module_flags)
-libextract_jpeg_la_LIBADD = 						\
+libextract_jpeg_la_LIBADD =                            \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(LIBJPEG_LIBS)
 
 # TIFF
 libextract_tiff_la_SOURCES = tracker-extract-tiff.c $(xmp_sources) $(iptc_sources)
 libextract_tiff_la_CFLAGS = $(LIBTIFF_CFLAGS)
 libextract_tiff_la_LDFLAGS = $(module_flags)
-libextract_tiff_la_LIBADD = 						\
+libextract_tiff_la_LIBADD =                            \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
-	$(TRACKER_EXTRACT_LIBS)						\
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_EXTRACT_LIBS)                        \
 	$(LIBTIFF_LIBS)
 
 # Playlists using totem-pl-parser
 libextract_playlist_la_SOURCES = tracker-extract-playlist.c
 libextract_playlist_la_CFLAGS = $(TOTEM_PL_PARSER_CFLAGS)
 libextract_playlist_la_LDFLAGS = $(module_flags)
-libextract_playlist_la_LIBADD = 					\
+libextract_playlist_la_LIBADD =                        \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
-	$(TOTEM_PL_PARSER_LIBS)						\
+	$(BUILD_LIBS)                                  \
+	$(TOTEM_PL_PARSER_LIBS)                        \
 	$(TRACKER_EXTRACT_LIBS)
 
 # TIFF
 libextract_text_la_SOURCES = tracker-extract-text.c
 libextract_text_la_LDFLAGS = $(module_flags)
-libextract_text_la_LIBADD = 						\
+libextract_text_la_LIBADD =                            \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_EXTRACT_LIBS)
 
 #
@@ -312,29 +312,29 @@ libextract_text_la_LIBADD = 						\
 #
 libexec_PROGRAMS = tracker-extract
 
-tracker_extract_SOURCES = 						\
-	$(marshal_sources)						\
-	$(dbus_sources)							\
-	tracker-albumart.c						\
-	tracker-albumart.h						\
-	tracker-config.c						\
-	tracker-config.h						\
-	tracker-dbus.c							\
-	tracker-dbus.h							\
-	tracker-extract.c						\
-	tracker-extract.h						\
-	tracker-read.c							\
-	tracker-read.h							\
-	tracker-main.c							\
-	tracker-main.h							\
+tracker_extract_SOURCES =                              \
+	$(marshal_sources)                             \
+	$(dbus_sources)                                \
+	tracker-albumart.c                             \
+	tracker-albumart.h                             \
+	tracker-config.c                               \
+	tracker-config.h                               \
+	tracker-dbus.c                                 \
+	tracker-dbus.h                                 \
+	tracker-extract.c                              \
+	tracker-extract.h                              \
+	tracker-read.c                                 \
+	tracker-read.h                                 \
+	tracker-main.c                                 \
+	tracker-main.h                                 \
 	tracker-albumart-generic.h
 
-tracker_extract_LDADD = 						\
+tracker_extract_LDADD =                                \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_EXTRACT_LIBS)
 
 tracker_extract_CFLAGS = $(AM_CPPFLAGS)
@@ -359,25 +359,25 @@ tracker_extract_SOURCES += tracker-albumart-dummy.c
 endif
 endif
 
-marshal_sources =                                         		\
-        tracker-marshal.h                             			\
+marshal_sources =                                      \
+        tracker-marshal.h                              \
         tracker-marshal.c
 
-dbus_sources = 								\
+dbus_sources =                                         \
 	tracker-extract-glue.h
 
 tracker-marshal.h: tracker-marshal.list
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
 
 tracker-marshal.c: tracker-marshal.list
-	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ &&	\
+	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ && \
 		   $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
 
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
 	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = 							\
-	$(marshal_sources)						\
+BUILT_SOURCES =                                        \
+	$(marshal_sources)                             \
 	$(dbus_sources)
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am
index 821852c..647c50c 100644
--- a/src/tracker-preferences/Makefile.am
+++ b/src/tracker-preferences/Makefile.am
@@ -9,47 +9,47 @@ desktop_DATA =  tracker-preferences.desktop
 
 pkgdata_DATA = tracker-preferences.ui
 
-AM_CPPFLAGS = 								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
-	-DTRACKER_DATADIR=\""$(datadir)/tracker"\" 			\
-	-DTRACKER_LOCALEDIR=\""$(localedir)"\" 				\
-	-DTRACKER_BINDIR=\""$(bindir)"\" 				\
-	-DTRACKER_LIBEXECDIR=\""$(libexecdir)"\" 			\
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"			\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DTRACKER_DATADIR=\""$(datadir)/tracker"\"     \
+	-DTRACKER_LOCALEDIR=\""$(localedir)"\"         \
+	-DTRACKER_BINDIR=\""$(bindir)"\"               \
+	-DTRACKER_LIBEXECDIR=\""$(libexecdir)"\"       \
+	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"       \
 	$(TRACKER_PREFERENCES_CFLAGS)
 
-BUILT_SOURCES = 							\
+BUILT_SOURCES =                                        \
 	tracker-preferences.vala.stamp
 
-config_class_sources = \
-	$(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	\
+config_class_sources =                                 \
+	$(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
 
 tracker_preferences_VALASOURCES = tracker-preferences.vala
 
-tracker_preferences_SOURCES = 						\
-	$(config_class_sources)						\
+tracker_preferences_SOURCES =                          \
+	$(config_class_sources)                        \
 	$(tracker_preferences_VALASOURCES:.vala=.c)
 
-tracker_preferences_LDADD = 						\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(BUILD_LIBS)							\
+tracker_preferences_LDADD =                            \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_PREFERENCES_LIBS)
 
-MAINTAINERCLEANFILES =							\
-	tracker-preferences.vala.stamp					\
+MAINTAINERCLEANFILES =                                 \
+	tracker-preferences.vala.stamp                 \
 	$(tracker_preferences_VALASOURCES:.vala=.c)
 
-EXTRA_DIST = 								\
-	$(pkgdata_DATA) 						\
-	config.vapi							\
-	tracker-config.vapi						\
-	tracker-status-icon-config.vapi					\
-	tracker-preferences.vala.stamp 					\
+EXTRA_DIST =                                           \
+	$(pkgdata_DATA)                                \
+	config.vapi                                    \
+	tracker-config.vapi                            \
+	tracker-status-icon-config.vapi                \
+	tracker-preferences.vala.stamp                 \
 	$(tracker_preferences_VALASOURCES)
 
 tracker-preferences.vala.stamp: $(tracker_preferences_VALASOURCES) tracker-config.vapi tracker-status-icon-config.vapi config.vapi
diff --git a/src/tracker-search-bar/Makefile.am b/src/tracker-search-bar/Makefile.am
index 0c7d7fe..de8d25e 100644
--- a/src/tracker-search-bar/Makefile.am
+++ b/src/tracker-search-bar/Makefile.am
@@ -2,28 +2,28 @@ include $(top_srcdir)/Makefile.decl
 
 libexec_PROGRAMS = tracker-search-bar
 
-tracker_search_bar_SOURCES = 					\
-	tracker-applet.c 					\
-	tracker-applet.h					\
-	tracker-aligned-window.c				\
-	tracker-aligned-window.h				\
-	tracker-results-window.c				\
-	tracker-results-window.h				\
-	tracker-utils.c						\
+tracker_search_bar_SOURCES =                           \
+	tracker-applet.c                               \
+	tracker-applet.h                               \
+	tracker-aligned-window.c                       \
+	tracker-aligned-window.h                       \
+	tracker-results-window.c                       \
+	tracker-results-window.h                       \
+	tracker-utils.c                                \
 	tracker-utils.h
 
-tracker_search_bar_CFLAGS = \
-	$(BUILD_CFLAGS)						\
-	-I$(top_srcdir)/src					\
-	-I$(top_builddir)/src					\
-	-DPKGDATADIR=\""$(pkgdatadir)"\"	 		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
+tracker_search_bar_CFLAGS =                            \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DPKGDATADIR=\""$(pkgdatadir)"\"               \
+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	$(TRACKER_SEARCH_BAR_CFLAGS)
 
-tracker_search_bar_LDADD = 					\
+tracker_search_bar_LDADD =                             \
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)						\
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_SEARCH_BAR_LIBS)
 
 uidir = $(datadir)/tracker
@@ -36,7 +36,7 @@ server_DATA = $(server_in_files:.server.in=.server)
 
 # Misc data
 resourcesdir = $(pkgdatadir)
-resources_DATA =						\
+resources_DATA =                                       \
 	GNOME_Search_Bar_Applet.xml
 
 # Build rules
@@ -46,11 +46,11 @@ resources_DATA =						\
 $(server_in_files): $(server_in_files:.server.in=.server.in.in)
 	$(AM_V_GEN)sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = 							\
-	$(resources_DATA)					\
-	tracker-search-bar.ui					\
+EXTRA_DIST =                                           \
+	$(resources_DATA)                              \
+	tracker-search-bar.ui                          \
 	GNOME_Search_Bar_Applet.server.in.in
 
-DISTCLEANFILES = 						\
-	$(server_DATA) 						\
+DISTCLEANFILES =                                       \
+	$(server_DATA)                                 \
 	$(server_in_files)
diff --git a/src/tracker-search-tool/Makefile.am b/src/tracker-search-tool/Makefile.am
index 8ceb65d..f077186 100644
--- a/src/tracker-search-tool/Makefile.am
+++ b/src/tracker-search-tool/Makefile.am
@@ -4,31 +4,31 @@ include $(top_srcdir)/Makefile.decl
 
 bin_PROGRAMS = tracker-search-tool
 
-tracker_search_tool_VALASOURCES = 				\
-	tracker-query.gs 					\
-	tracker-entry.gs 					\
-	tracker-result-grid.gs		 			\
-	tracker-search-tool.gs 					\
-	tracker-category-view.gs 				\
-	tracker-metadata-tile.gs		 		\
+tracker_search_tool_VALASOURCES =                      \
+	tracker-query.gs                               \
+	tracker-entry.gs                               \
+	tracker-result-grid.gs                         \
+	tracker-search-tool.gs                         \
+	tracker-category-view.gs                       \
+	tracker-metadata-tile.gs                       \
 	tracker-utils.gs
 
-tracker_search_tool_SOURCES = 					\
+tracker_search_tool_SOURCES =                          \
 	$(tracker_search_tool_VALASOURCES:.gs=.c)
 
 tracker_search_tool.gs.stamp: $(tracker_search_tool_VALASOURCES)
 	$(VALAC) -C -g --pkg dbus-glib-1 --pkg gee-1.0 --pkg gio-unix-2.0 --pkg gtk+-2.0 $^
 	touch tracker_search_tool.gs.stamp
 
-tracker_search_tool_CFLAGS = 					\
-	$(BUILD_CFLAGS)						\
-	-DTRACKER_UI_DIR=\"$(datadir)/tracker/\"		\
-	-DSRCDIR=\"$(abs_srcdir)/\"				\
-	-include$(top_builddir)/config.h  			\
+tracker_search_tool_CFLAGS =                           \
+	$(BUILD_CFLAGS)                                \
+	-DTRACKER_UI_DIR=\"$(datadir)/tracker/\"       \
+	-DSRCDIR=\"$(abs_srcdir)/\"                    \
+	-include$(top_builddir)/config.h               \
 	$(TRACKER_SEARCH_TOOL_CFLAGS)
 
-tracker_search_tool_LDADD = 					\
-	$(BUILD_LIBS)						\
+tracker_search_tool_LDADD =                            \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_SEARCH_TOOL_LIBS)
 
 uidir = $(datadir)/tracker
@@ -42,16 +42,16 @@ icon_DATA = thumbnail_frame.png
 
 CLEANFILES = $(desktop_DATA)
 
-EXTRA_DIST = 							\
-	$(tracker_search_tool_VALASOURCES) 			\
-	$(icon_DATA) 						\
-	$(ui_DATA)						\
+EXTRA_DIST =                                           \
+	$(tracker_search_tool_VALASOURCES)             \
+	$(icon_DATA)                                   \
+	$(ui_DATA)                                     \
 	tracker_search_tool.gs.stamp
 
-MAINTAINERCLEANFILES = 						\
-	tracker_search_tool.gs.stamp 				\
+MAINTAINERCLEANFILES =                                 \
+	tracker_search_tool.gs.stamp                   \
 	$(tracker_search_tool_VALASOURCES:.gs=.c)
 
-BUILT_SOURCES = 						\
+BUILT_SOURCES =                                        \
 	tracker_search_tool.gs.stamp
 
diff --git a/src/tracker-status-icon/Makefile.am b/src/tracker-status-icon/Makefile.am
index c0a6f76..7a89d77 100644
--- a/src/tracker-status-icon/Makefile.am
+++ b/src/tracker-status-icon/Makefile.am
@@ -1,40 +1,40 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
-	-DICONS_DIR=\""$(datadir)/tracker/icons/"\"			\
-	-DSHAREDIR=\""$(datadir)"\"					\
-	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DTRACKER_LIBEXECDIR=\""$(libexecdir)"\" 			\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DICONS_DIR=\""$(datadir)/tracker/icons/"\"    \
+	-DSHAREDIR=\""$(datadir)"\"                    \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-DTRACKER_LIBEXECDIR=\""$(libexecdir)"\"       \
 	$(TRACKER_STATUS_ICON_CFLAGS)
 
 bin_PROGRAMS = tracker-status-icon
 
 # Note: the -lX11 is needed for XGetModifierMapping() and other X11 calls
-tracker_status_icon_LDADD = 						\
-	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la 	\
+tracker_status_icon_LDADD =                            \
+	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_STATUS_ICON_LIBS)
 
-tracker_status_icon_SOURCES =						\
-	tomboykeybinder.c						\
-	tomboykeybinder.h						\
-	tracker-icon-config.c						\
-	tracker-icon-config.h						\
-	tracker-status-icon.c						\
-	tracker-status-icon.h						\
+tracker_status_icon_SOURCES =                          \
+	tomboykeybinder.c                              \
+	tomboykeybinder.h                              \
+	tracker-icon-config.c                          \
+	tracker-icon-config.h                          \
+	tracker-status-icon.c                          \
+	tracker-status-icon.h                          \
 	tracker-main.c
 
 icondir = $(datadir)/tracker/icons
 
-icon_DATA = 								\
-	tracker-applet-default.png 					\
-	tracker-applet-indexing1.png 					\
-	tracker-applet-indexing2.png 					\
+icon_DATA =                                            \
+	tracker-applet-default.png                     \
+	tracker-applet-indexing1.png                   \
+	tracker-applet-indexing2.png                   \
 	tracker-applet-paused.png
 
 @INTLTOOL_DESKTOP_RULE@
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 0da06ae..c3ad7b5 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -1,13 +1,13 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-DSHAREDIR=\""$(datadir)"\"					\
-	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DMAIL_MODULES_DIR=\""$(libdir)"/tracker-$(TRACKER_API_VERSION)/mail-modules\"         \
-	-DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon"\"	\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-DSHAREDIR=\""$(datadir)"\"                    \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-DMAIL_MODULES_DIR=\""$(libdir)"/tracker-$(TRACKER_API_VERSION)/mail-modules\" \
+	-DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon"\" \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(TRACKER_STORE_CFLAGS)
 
 #
@@ -15,53 +15,53 @@ AM_CPPFLAGS =								\
 #
 libexec_PROGRAMS = tracker-store
 
-tracker_store_SOURCES =							\
-	$(marshal_sources)						\
-	$(dbus_sources)							\
-	tracker-backup.c						\
-	tracker-backup.h						\
-	tracker-config.c						\
-	tracker-config.h						\
-	tracker-dbus.c							\
-	tracker-dbus.h							\
-	tracker-events.c						\
-	tracker-events.h						\
-	tracker-writeback.c						\
-	tracker-writeback.h						\
-	tracker-main.c							\
-	tracker-resources.c						\
-	tracker-resources.h						\
-	tracker-statistics.c						\
-	tracker-statistics.h						\
-	tracker-store.c							\
-	tracker-store.h							\
-	tracker-status.c						\
-	tracker-status.h						\
-	tracker-steroids.c						\
+tracker_store_SOURCES =                                \
+	$(marshal_sources)                             \
+	$(dbus_sources)                                \
+	tracker-backup.c                               \
+	tracker-backup.h                               \
+	tracker-config.c                               \
+	tracker-config.h                               \
+	tracker-dbus.c                                 \
+	tracker-dbus.h                                 \
+	tracker-events.c                               \
+	tracker-events.h                               \
+	tracker-writeback.c                            \
+	tracker-writeback.h                            \
+	tracker-main.c                                 \
+	tracker-resources.c                            \
+	tracker-resources.h                            \
+	tracker-statistics.c                           \
+	tracker-statistics.h                           \
+	tracker-store.c                                \
+	tracker-store.h                                \
+	tracker-status.c                               \
+	tracker-status.h                               \
+	tracker-steroids.c                             \
 	tracker-steroids.h
 
-tracker_store_LDADD =							\
-	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+tracker_store_LDADD =                                  \
+	$(top_builddir)/src/libtracker-data/libtracker-data.la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_STORE_LIBS)
 
-marshal_sources =                                         		\
-        tracker-marshal.h                             			\
+marshal_sources =                                      \
+        tracker-marshal.h                              \
         tracker-marshal.c
 
-dbus_sources = 								\
-	tracker-backup-glue.h						\
-	tracker-resources-glue.h					\
-	tracker-statistics-glue.h					\
+dbus_sources =                                         \
+	tracker-backup-glue.h                          \
+	tracker-resources-glue.h                       \
+	tracker-statistics-glue.h                      \
 	tracker-status-glue.h
 
 tracker-marshal.h: tracker-marshal.list
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
 
 tracker-marshal.c: tracker-marshal.list
-	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ &&	\
+	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ && \
 		   $(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
 
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
@@ -70,8 +70,8 @@ tracker-marshal.c: tracker-marshal.list
 %-client.h: $(top_srcdir)/data/dbus/%.xml
 	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = 							\
-	$(marshal_sources)						\
+BUILT_SOURCES =                                        \
+	$(marshal_sources)                             \
 	$(dbus_sources)
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am
index 30e9c38..fcb417b 100644
--- a/src/tracker-utils/Makefile.am
+++ b/src/tracker-utils/Makefile.am
@@ -1,26 +1,26 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(TRACKER_UTILS_CFLAGS)
 
-libs = 									\
+libs =                                                 \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_UTILS_LIBS)
 
-bin_PROGRAMS = 								\
-	tracker-import							\
-	tracker-info							\
-	tracker-search 							\
-	tracker-sparql							\
-	tracker-stats							\
-	tracker-status							\
+bin_PROGRAMS =                                         \
+	tracker-import                                 \
+	tracker-info                                   \
+	tracker-search                                 \
+	tracker-sparql                                 \
+	tracker-stats                                  \
+	tracker-status                                 \
 	tracker-tag
 
 tracker_search_SOURCES = tracker-search.c
@@ -44,13 +44,13 @@ tracker_sparql_LDADD = $(libs)
 tracker_import_SOURCES = tracker-import.c
 tracker_import_LDADD = $(libs)
 
-dbus_sources = 								\
+dbus_sources =                                         \
 	tracker-status-client.h
 
 %-client.h: $(top_srcdir)/data/dbus/%.xml
 	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = 							\
+BUILT_SOURCES =                                        \
 	$(dbus_sources)
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index 18a0d46..7afd682 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -3,13 +3,13 @@ include $(top_srcdir)/Makefile.decl
 module_flags = -module -avoid-version -no-undefined
 modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/writeback-modules
 
-AM_CPPFLAGS = 								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src 						\
-	-I$(top_builddir)/src						\
-	-DLOCALEDIR=\""$(localedir)"\" 					\
-	-DMODULESDIR=\"$(modulesdir)\"					\
-	-DWRITEBACK_MODULES_DIR=\""$(modulesdir)"\" 			\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-DMODULESDIR=\"$(modulesdir)\"                 \
+	-DWRITEBACK_MODULES_DIR=\""$(modulesdir)"\"    \
 	$(TRACKER_WRITEBACK_CFLAGS)
 
 modules_LTLIBRARIES =
@@ -44,50 +44,50 @@ endif
 #
 libexec_PROGRAMS = tracker-writeback
 
-tracker_writeback_SOURCES = 						\
-	$(marshal_sources)						\
-	$(dbus_sources)							\
-	tracker-config.c						\
-	tracker-config.h						\
-	tracker-writeback-consumer.c					\
-	tracker-writeback-consumer.h					\
-	tracker-writeback-dbus.h					\
-	tracker-writeback-dispatcher.c					\
-	tracker-writeback-dispatcher.h					\
-	tracker-writeback-file.c					\
-	tracker-writeback-file.h					\
-	tracker-writeback-module.c					\
-	tracker-writeback-module.h					\
-	tracker-writeback.c						\
-	tracker-writeback.h						\
+tracker_writeback_SOURCES =                            \
+	$(marshal_sources)                             \
+	$(dbus_sources)                                \
+	tracker-config.c                               \
+	tracker-config.h                               \
+	tracker-writeback-consumer.c                   \
+	tracker-writeback-consumer.h                   \
+	tracker-writeback-dbus.h                       \
+	tracker-writeback-dispatcher.c                 \
+	tracker-writeback-dispatcher.h                 \
+	tracker-writeback-file.c                       \
+	tracker-writeback-file.h                       \
+	tracker-writeback-module.c                     \
+	tracker-writeback-module.h                     \
+	tracker-writeback.c                            \
+	tracker-writeback.h                            \
 	tracker-main.c
 
-tracker_writeback_LDADD = 						\
+tracker_writeback_LDADD =                              \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la 	\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(TRACKER_WRITEBACK_LIBS)
 
-dbus_sources = 								\
+dbus_sources =                                         \
 	tracker-writeback-glue.h
 
-marshal_sources =							\
-	tracker-marshal.h						\
+marshal_sources =                                      \
+	tracker-marshal.h                              \
 	tracker-marshal.c
 
 tracker-marshal.h: tracker-marshal.list
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
 
 tracker-marshal.c: tracker-marshal.list
-	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ &&        \
+	$(AM_V_GEN)echo "#include \"tracker-marshal.h\"" > $@ && \
 		$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body >> $@
 
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
 	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = 							\
-	$(dbus_sources)							\
+BUILT_SOURCES =                                        \
+	$(dbus_sources)                                \
 	$(marshal_sources)
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/vapi/Makefile.am b/src/vapi/Makefile.am
index d31f770..9f7f46e 100644
--- a/src/vapi/Makefile.am
+++ b/src/vapi/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 						\
-	posix.vapi					\
+EXTRA_DIST =                                           \
+	posix.vapi                                     \
 	glib-2.0-fixes.vapi
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b19a56e..9785b5e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,14 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = 			\
-	common 			\
-	libtracker-common	\
-	libtracker-client	\
-	libtracker-extract	\
-	libtracker-miner	\
-	libtracker-data		\
-	libtracker-sparql	\
-	tracker-steroids	\
+SUBDIRS =                                              \
+	common                                         \
+	libtracker-common                              \
+	libtracker-client                              \
+	libtracker-extract                             \
+	libtracker-miner                               \
+	libtracker-data                                \
+	libtracker-sparql                              \
+	tracker-steroids                               \
 	tracker-writeback
 
 if DIST_FUNCTIONAL_TESTS
diff --git a/tests/common/Makefile.am b/tests/common/Makefile.am
index e92a808..acca798 100644
--- a/tests/common/Makefile.am
+++ b/tests/common/Makefile.am
@@ -2,16 +2,16 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_LTLIBRARIES = libtracker-testcommon.la
 
-AM_CPPFLAGS = 					\
-	$(BUILD)				\
-	-DTEST_TEXT=\""$(top_srcdir)"/tests/libtracker-common/non-utf8.txt\"	\
+AM_CPPFLAGS =                                          \
+	$(BUILD)                                       \
+	-DTEST_TEXT=\""$(top_srcdir)"/tests/libtracker-common/non-utf8.txt\" \
 	$(LIBTRACKER_COMMON_CFLAGS)
 
-LDADD = 					\
-	$(BUILD_LIBS)				\
+LDADD =                                                \
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_COMMON_LIBS)
 
-libtracker_testcommon_la_SOURCES = 		\
-	tracker-test-helpers.c 			\
+libtracker_testcommon_la_SOURCES =                     \
+	tracker-test-helpers.c                         \
 	tracker-test-helpers.h
 
diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am
index bfb1573..ea862c4 100644
--- a/tests/functional-tests/Makefile.am
+++ b/tests/functional-tests/Makefile.am
@@ -1,61 +1,61 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = 				\
-	ipc				\
-	common				\
-	test-configurations 		\
-	test-extraction-data 		\
-	test-writeback-data		\
-	ttl				\
-	unittest2			\
+SUBDIRS =                                              \
+	ipc                                            \
+	common                                         \
+	test-configurations                            \
+	test-extraction-data                           \
+	test-writeback-data                            \
+	ttl                                            \
+	unittest2                                      \
 	test-ontologies
 
 configdir = $(datadir)/tracker-tests
 
-config_SCRIPTS =			\
-	__init__.py			\
-	$(slow_tests)			\
+config_SCRIPTS =                                       \
+	__init__.py                                    \
+	$(slow_tests)                                  \
 	$(standard_tests)
 
 if HAVE_MAEMO
-config_SCRIPTS += 			\
-	tests.xml 			\
-	tracker-tests.aegis		
+config_SCRIPTS +=                                      \
+	tests.xml                                      \
+	tracker-tests.aegis
 endif
 
 
-standard_tests = 			\
+standard_tests =                                       \
 	01-insertion.py
 if HAVE_TRACKER_FTS
 standard_tests += 03-fts-functions.py
 endif
-standard_tests +=			\
-	04-group-concat.py		\
-	05-coalesce.py			\
-	06-distance.py			\
-	07-graph.py			\
-	08-unique-insertions.py		\
-	09-concurrent-query.py		\
-	14-signals.py			\
-	15-statistics.py		\
-	16-collation.py			\
-	17-ontology-changes.py		\
-	200-backup-restore.py		\
+standard_tests +=                                      \
+	04-group-concat.py                             \
+	05-coalesce.py                                 \
+	06-distance.py                                 \
+	07-graph.py                                    \
+	08-unique-insertions.py                        \
+	09-concurrent-query.py                         \
+	14-signals.py                                  \
+	15-statistics.py                               \
+	16-collation.py                                \
+	17-ontology-changes.py                         \
+	200-backup-restore.py                          \
 	300-miner-basic-ops.py
 if HAVE_TRACKER_FTS
 standard_tests += 310-fts-indexing.py
 endif
-standard_tests +=			\
-	400-extractor.py		\
-	500-writeback.py		\
-	mass-storage-mode.py		\
-	performance-tc-modified.py	\
+standard_tests +=                                      \
+	400-extractor.py                               \
+	500-writeback.py                               \
+	mass-storage-mode.py                           \
+	performance-tc-modified.py                     \
 	virtual-files-tc.py
 
-slow_tests = 				\
-	10-sqlite-misused.py		\
-	11-sqlite-batch-misused.py	\
-	12-transactions.py		\
+slow_tests =                                           \
+	10-sqlite-misused.py                           \
+	11-sqlite-batch-misused.py                     \
+	12-transactions.py                             \
 	13-threaded-store.py
 
 tests.xml:
@@ -80,11 +80,11 @@ ttl/gen-test-data.stamp:
 functional-test: ${standard_tests}
 	@if test -h /targets/links/scratchbox.config ; then \
 		export SBOX_REDIRECT_IGNORE=/usr/bin/python ; \
-		ENV_COMMAND_WRAPPER=meego-run ;\
-	else \
-		ENV_COMMAND_WRAPPER="" ; \
-	fi ; \
-	for testfile in ${standard_tests} ; do \
+		ENV_COMMAND_WRAPPER=meego-run ;
+	else                                           \
+		ENV_COMMAND_WRAPPER="" ;                      \
+	fi ;                                           \
+	for testfile in ${standard_tests} ; do         \
 	  echo "Trying with" $$ENV_COMMAND_WRAPPER $$testfile ; \
 	  test ! -x $$testfile  || $$ENV_COMMAND_WRAPPER ./$$testfile > /dev/null; \
 	 done
@@ -92,20 +92,20 @@ functional-test: ${standard_tests}
 functional-test-slow: ${slow_tests}
 	@if test -h /targets/links/scratchbox.config ; then \
 		export SBOX_REDIRECT_IGNORE=/usr/bin/python ; \
-		ENV_COMMAND_WRAPPER=meego-run ;\
-	else \
-		ENV_COMMAND_WRAPPER="" ; \
-	fi ; \
-	@for test in ${slow_tests} ; do \
+		ENV_COMMAND_WRAPPER=meego-run ;
+	else                                           \
+		ENV_COMMAND_WRAPPER="" ;                      \
+	fi ;                                           \
+	@for test in ${slow_tests} ; do                \
 	  echo "Trying with" $$ENV_COMMAND_WRAPPER $$test ; \
 	  test ! -x $$test  || $$ENV_COMMAND_WRAPPER ./$$test > /dev/null; \
 	 done
 
-EXTRA_DIST = 				\
+EXTRA_DIST =                                           \
 	$(config_SCRIPTS)
 
 if HAVE_MAEMO
-CLEANFILES =				\
-	tests.xml			\
+CLEANFILES =                                           \
+	tests.xml                                      \
 	tracker-tests.aegis
 endif
diff --git a/tests/functional-tests/common/data/Images/Makefile.am b/tests/functional-tests/common/data/Images/Makefile.am
index 69d089e..1e348be 100644
--- a/tests/functional-tests/common/data/Images/Makefile.am
+++ b/tests/functional-tests/common/data/Images/Makefile.am
@@ -2,9 +2,9 @@ include $(top_srcdir)/Makefile.decl
 
 configdir = $(datadir)/tracker-tests/data/Images
 
-config_DATA =			\
-	test-image-1.jpg	\
-	test-image-2.png	\
+config_DATA =                                          \
+	test-image-1.jpg                               \
+	test-image-2.png                               \
 	test-image-3.tif
 
 EXTRA_DIST = $(config_DATA)
diff --git a/tests/functional-tests/common/data/Makefile.am b/tests/functional-tests/common/data/Makefile.am
index 231f058..376e4ba 100644
--- a/tests/functional-tests/common/data/Makefile.am
+++ b/tests/functional-tests/common/data/Makefile.am
@@ -1,15 +1,15 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = 		\
-	Music		\
-	Video		\
-	Images		\
-	Text		
+SUBDIRS =                                              \
+	Music                                          \
+	Video                                          \
+	Images                                         \
+	Text
 
 configdir = $(datadir)/tracker-tests/data
 
-config_DATA =			\
-	pickled_Music		\
+config_DATA =                                          \
+	pickled_Music                                  \
 	pickled_Images
 
 EXTRA_DIST = $(config_DATA)
diff --git a/tests/functional-tests/common/data/Music/Makefile.am b/tests/functional-tests/common/data/Music/Makefile.am
index 0166f9f..8cc8925 100644
--- a/tests/functional-tests/common/data/Music/Makefile.am
+++ b/tests/functional-tests/common/data/Music/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
 
 configdir = $(datadir)/tracker-tests/data/Music
 
-config_DATA =			\
+config_DATA =                                          \
 	tracker-mp3-test.mp3
 
 EXTRA_DIST = $(config_DATA)
diff --git a/tests/functional-tests/common/data/Video/Makefile.am b/tests/functional-tests/common/data/Video/Makefile.am
index fafae7d..e3bbf0f 100644
--- a/tests/functional-tests/common/data/Video/Makefile.am
+++ b/tests/functional-tests/common/data/Video/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 if DIST_FUNCTIONAL_TESTS
 configdir = $(datadir)/tracker-tests/data/Video
 
-config_DATA =			\
+config_DATA =                                          \
 	test-video.mp4
 
 EXTRA_DIST = $(config_DATA)
diff --git a/tests/functional-tests/common/utils/Makefile.am b/tests/functional-tests/common/utils/Makefile.am
index 8223d2f..91ff755 100644
--- a/tests/functional-tests/common/utils/Makefile.am
+++ b/tests/functional-tests/common/utils/Makefile.am
@@ -2,15 +2,15 @@ include $(top_srcdir)/Makefile.decl
 
 utilsdir = $(datadir)/tracker-tests/common/utils
 
-utils_SCRIPTS = 		\
-	__init__.py		\
-	configuration.py	\
-	expectedFailure.py	\
-	helpers.py		\
-	storetest.py		\
-	minertest.py		\
+utils_SCRIPTS =                                        \
+	__init__.py                                    \
+	configuration.py                               \
+	expectedFailure.py                             \
+	helpers.py                                     \
+	storetest.py                                   \
+	minertest.py                                   \
 	system.py
 
-EXTRA_DIST = 			\
-	configuration.py.in	\
+EXTRA_DIST =                                           \
+	configuration.py.in                            \
 	$(utils_SCRIPTS)
diff --git a/tests/functional-tests/ipc/Makefile.am b/tests/functional-tests/ipc/Makefile.am
index fec8f53..fc7db0f 100644
--- a/tests/functional-tests/ipc/Makefile.am
+++ b/tests/functional-tests/ipc/Makefile.am
@@ -1,33 +1,33 @@
 include $(top_srcdir)/Makefile.decl
 
-noinst_PROGRAMS =					\
-	test-busy-handling				\
-	test-direct-query				\
-	test-bus-query					\
-	test-default-update				\
-	test-bus-update				\
-	test-class-signal				\
-	test-class-signal-performance			\
+noinst_PROGRAMS =                                      \
+	test-busy-handling                             \
+	test-direct-query                              \
+	test-bus-query                                 \
+	test-default-update                            \
+	test-bus-update                                \
+	test-class-signal                              \
+	test-class-signal-performance                  \
 	test-update-array-performance
 
-AM_CPPFLAGS =						\
-	$(BUILD_CFLAGS)					\
-	-I$(top_srcdir)/src				\
-	-I$(top_builddir)/src				\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
 	$(LIBTRACKER_SPARQL_CFLAGS)
 
-LDADD =							\
+LDADD =                                                \
 	$(top_builddir)/src/libtracker-direct/libtracker-direct.la \
 	$(top_builddir)/src/libtracker-bus/libtracker-bus.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
-	$(BUILD_LIBS)					\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_SPARQL_LIBS)
 
 test_busy_handling_VALASOURCES = test-busy-handling.vala
 
-test_busy_handling_SOURCES =				\
-	test-busy-handling.vala.stamp			\
+test_busy_handling_SOURCES =                           \
+	test-busy-handling.vala.stamp                  \
 	$(test_busy_handling_VALASOURCES:.vala=.c)
 
 test-busy-handling.vala.stamp: $(test_busy_handling_VALASOURCES)
@@ -36,31 +36,31 @@ test-busy-handling.vala.stamp: $(test_busy_handling_VALASOURCES)
 
 test_direct_query_VALASOURCES = test-shared-query.vala test-direct-query.vala
 
-test_direct_query_SOURCES =				\
-	test-direct-query.vala.stamp			\
+test_direct_query_SOURCES =                            \
+	test-direct-query.vala.stamp                   \
 	$(test_direct_query_VALASOURCES:.vala=.c)
 
 test_default_update_VALASOURCES = test-shared-update.vala test-default-update.vala
 
-test_default_update_SOURCES =				\
-	test-default-update.vala.stamp			\
+test_default_update_SOURCES =                          \
+	test-default-update.vala.stamp                 \
 	$(test_default_update_VALASOURCES:.vala=.c)
 
 test_bus_query_VALASOURCES = test-shared-query.vala test-bus-query.vala
 
 test_update_array_performance_SOURCES = test-update-array-performance.c
 
-test_bus_query_SOURCES =				\
-	test-bus-query.vala.stamp			\
+test_bus_query_SOURCES =                               \
+	test-bus-query.vala.stamp                      \
 	$(test_bus_query_VALASOURCES:.vala=.c)
 
 test_bus_update_VALASOURCES = test-shared-update.vala test-bus-update.vala
 
-test_bus_update_SOURCES =				\
-	test-bus-update.vala.stamp			\
+test_bus_update_SOURCES =                              \
+	test-bus-update.vala.stamp                     \
 	$(test_bus_update_VALASOURCES:.vala=.c)
 
-direct_vapi_sources =					\
+direct_vapi_sources =                                  \
 	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
 	$(top_srcdir)/src/libtracker-direct/tracker-direct.vapi
 
@@ -72,7 +72,7 @@ test-default-update.vala.stamp: $(test_default_update_VALASOURCES) $(direct_vapi
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 $^
 	$(AM_V_GEN)touch $@
 
-bus_vapi_sources = \
+bus_vapi_sources =                                     \
 	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
 	$(top_srcdir)/src/libtracker-bus/tracker-bus.vapi
 
@@ -86,8 +86,8 @@ test-bus-update.vala.stamp: $(test_bus_update_VALASOURCES) $(bus_vapi_sources)
 
 test_class_signal_VALASOURCES = test-class-signal.vala
 
-test_class_signal_SOURCES =				\
-	test-class-signal.vala.stamp			\
+test_class_signal_SOURCES =                            \
+	test-class-signal.vala.stamp                   \
 	$(test_class_signal_VALASOURCES:.vala=.c)
 
 test-class-signal.vala.stamp: $(test_class_signal_VALASOURCES) $(direct_vapi_sources)
@@ -96,39 +96,39 @@ test-class-signal.vala.stamp: $(test_class_signal_VALASOURCES) $(direct_vapi_sou
 
 test_class_signal_performance_VALASOURCES = test-class-signal-performance.vala
 
-test_class_signal_performance_SOURCES =		\
-	test-class-signal-performance.vala.stamp	\
+test_class_signal_performance_SOURCES =                \
+	test-class-signal-performance.vala.stamp       \
 	$(test_class_signal_performance_VALASOURCES:.vala=.c)
 
 test-class-signal-performance.vala.stamp: $(test_class_signal_performance_VALASOURCES) $(direct_vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 $^
 	$(AM_V_GEN)touch $@
 
-BUILT_SOURCES =						\
-	test-busy-handling.vala.stamp			\
-	test-class-signal.vala.stamp			\
-	test-class-signal-performance.vala.stamp	\
-	test-direct-query.vala.stamp			\
-	test-bus-query.vala.stamp			\
-	test-default-update.vala.stamp			\
+BUILT_SOURCES =                                        \
+	test-busy-handling.vala.stamp                  \
+	test-class-signal.vala.stamp                   \
+	test-class-signal-performance.vala.stamp       \
+	test-direct-query.vala.stamp                   \
+	test-bus-query.vala.stamp                      \
+	test-default-update.vala.stamp                 \
 	test-bus-update.vala.stamp
 
-EXTRA_DIST =						\
-	$(BUILT_SOURCES)				\
-	$(test_busy_handling_VALASOURCES)		\
-	$(test_class_signal_VALASOURCES)		\
-	$(test_class_signal_performance_VALASOURCES)	\
-	$(test_direct_query_VALASOURCES)		\
-	$(test_default_update_VALASOURCES)		\
-	$(test_bus_query_VALASOURCES)			\
+EXTRA_DIST =                                           \
+	$(BUILT_SOURCES)                               \
+	$(test_busy_handling_VALASOURCES)              \
+	$(test_class_signal_VALASOURCES)               \
+	$(test_class_signal_performance_VALASOURCES)   \
+	$(test_direct_query_VALASOURCES)               \
+	$(test_default_update_VALASOURCES)             \
+	$(test_bus_query_VALASOURCES)                  \
 	$(test_bus_update_VALASOURCES)
 
-MAINTAINERCLEANFILES =					\
-	$(BUILT_SOURCES)				\
-	$(test_busy_handling_VALASOURCES:.vala=.c)	\
-	$(test_class_signal_VALASOURCES:.vala=.c)	\
+MAINTAINERCLEANFILES =                                 \
+	$(BUILT_SOURCES)                               \
+	$(test_busy_handling_VALASOURCES:.vala=.c)     \
+	$(test_class_signal_VALASOURCES:.vala=.c)      \
 	$(test_class_signal_performance_VALASOURCES:.vala=.c) \
-	$(test_bus_query_VALASOURCES:.vala=.c)		\
-	$(test_bus_update_VALASOURCES:.vala=.c)		\
-	$(test_direct_query_VALASOURCES:.vala=.c)	\
+	$(test_bus_query_VALASOURCES:.vala=.c)         \
+	$(test_bus_update_VALASOURCES:.vala=.c)        \
+	$(test_direct_query_VALASOURCES:.vala=.c)      \
 	$(test_default_update_VALASOURCES:.vala=.c)
diff --git a/tests/functional-tests/test-configurations/Makefile.am b/tests/functional-tests/test-configurations/Makefile.am
index 50a799f..bc0a59d 100644
--- a/tests/functional-tests/test-configurations/Makefile.am
+++ b/tests/functional-tests/test-configurations/Makefile.am
@@ -1,3 +1,3 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = miner-basic-ops writeback
\ No newline at end of file
+SUBDIRS = miner-basic-ops writeback
diff --git a/tests/functional-tests/test-configurations/miner-basic-ops/Makefile.am b/tests/functional-tests/test-configurations/miner-basic-ops/Makefile.am
index 2bb1603..2de0425 100644
--- a/tests/functional-tests/test-configurations/miner-basic-ops/Makefile.am
+++ b/tests/functional-tests/test-configurations/miner-basic-ops/Makefile.am
@@ -2,8 +2,8 @@ include $(top_srcdir)/Makefile.decl
 
 conftestdir = $(datadir)/tracker-tests/test-configurations/miner-basic-ops/tracker
 
-conftest_DATA =				\
-	tracker/tracker-miner-fs.cfg	\
+conftest_DATA =                                        \
+	tracker/tracker-miner-fs.cfg                   \
 	tracker/tracker-fts.cfg
 
-EXTRA_DIST = $(conftest_DATA)
\ No newline at end of file
+EXTRA_DIST = $(conftest_DATA)
diff --git a/tests/functional-tests/test-configurations/writeback/Makefile.am b/tests/functional-tests/test-configurations/writeback/Makefile.am
index dab7611..cda3448 100644
--- a/tests/functional-tests/test-configurations/writeback/Makefile.am
+++ b/tests/functional-tests/test-configurations/writeback/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
 
 wbconftestdir = $(datadir)/tracker-tests/test-configurations/writeback/tracker
 
-wbconftest_DATA =			\
-	tracker/tracker-miner-fs.cfg	
+wbconftest_DATA =                                      \
+	tracker/tracker-miner-fs.cfg
 
-EXTRA_DIST = $(wbconftest_DATA)
\ No newline at end of file
+EXTRA_DIST = $(wbconftest_DATA)
diff --git a/tests/functional-tests/test-extraction-data/audio/Makefile.am b/tests/functional-tests/test-extraction-data/audio/Makefile.am
index 4744a5b..8fa599d 100644
--- a/tests/functional-tests/test-extraction-data/audio/Makefile.am
+++ b/tests/functional-tests/test-extraction-data/audio/Makefile.am
@@ -2,10 +2,10 @@ include $(top_srcdir)/Makefile.decl
 
 audiotestdir = $(datadir)/tracker-tests/test-extraction-data/audio
 
-audiotest_DATA =		\
-	audio-test-1.mp3	\
-	audio-test-1.expected	\
-	audio-test-2.mp3	\
+audiotest_DATA =                                       \
+	audio-test-1.mp3                               \
+	audio-test-1.expected                          \
+	audio-test-2.mp3                               \
 	audio-test-2.expected
 
-EXTRA_DIST = $(audiotest_DATA)
\ No newline at end of file
+EXTRA_DIST = $(audiotest_DATA)
diff --git a/tests/functional-tests/test-extraction-data/images/Makefile.am b/tests/functional-tests/test-extraction-data/images/Makefile.am
index 9db10d4..65df57b 100644
--- a/tests/functional-tests/test-extraction-data/images/Makefile.am
+++ b/tests/functional-tests/test-extraction-data/images/Makefile.am
@@ -2,16 +2,16 @@ include $(top_srcdir)/Makefile.decl
 
 imagestestdir = $(datadir)/tracker-tests/test-extraction-data/images
 
-imagestest_DATA =			\
-	test-image-1.jpg		\
-	test-image-1.expected		\
-	test-image-2.png		\
-	test-image-2.expected 		\
-	test-image-3.tif		\
-	test-image-3.expected		\
-	xmp-loaded-1.gif		\
-	xmp-loaded-1.expected 		\
-	corrupted-image.gif		\
+imagestest_DATA =                                      \
+	test-image-1.jpg                               \
+	test-image-1.expected                          \
+	test-image-2.png                               \
+	test-image-2.expected                          \
+	test-image-3.tif                               \
+	test-image-3.expected                          \
+	xmp-loaded-1.gif                               \
+	xmp-loaded-1.expected                          \
+	corrupted-image.gif                            \
 	corrupted-image.expected
 
 EXTRA_DIST = $(imagestest_DATA)
diff --git a/tests/functional-tests/test-extraction-data/office/Makefile.am b/tests/functional-tests/test-extraction-data/office/Makefile.am
index 71d070a..669cd71 100644
--- a/tests/functional-tests/test-extraction-data/office/Makefile.am
+++ b/tests/functional-tests/test-extraction-data/office/Makefile.am
@@ -2,12 +2,12 @@ include $(top_srcdir)/Makefile.decl
 
 officetestdir = $(datadir)/tracker-tests/test-extraction-data/office
 
-officetest_DATA =		\
-	office-doc.doc		\
-	office-doc.expected	\
-	pdf-doc.pdf		\
-	pdf-doc.expected	\
-	powerpoint.ppt		\
+officetest_DATA =                                      \
+	office-doc.doc                                 \
+	office-doc.expected                            \
+	pdf-doc.pdf                                    \
+	pdf-doc.expected                               \
+	powerpoint.ppt                                 \
 	powerpoint.expected
 
-EXTRA_DIST = $(officetest_DATA)
\ No newline at end of file
+EXTRA_DIST = $(officetest_DATA)
diff --git a/tests/functional-tests/test-extraction-data/playlists/Makefile.am b/tests/functional-tests/test-extraction-data/playlists/Makefile.am
index cf7d291..daa594d 100644
--- a/tests/functional-tests/test-extraction-data/playlists/Makefile.am
+++ b/tests/functional-tests/test-extraction-data/playlists/Makefile.am
@@ -3,9 +3,9 @@ include $(top_srcdir)/Makefile.decl
 if HAVE_TOTEM_PL_PARSER
 playlisttestdir = $(datadir)/tracker-tests/test-extraction-data/playlists
 
-playlisttest_DATA =		\
-	playlist-test-1.m3u	\
+playlisttest_DATA =                                    \
+	playlist-test-1.m3u                            \
 	playlist-test-1.expected
 
 EXTRA_DIST = $(playlisttest_DATA)
-endif
\ No newline at end of file
+endif
diff --git a/tests/functional-tests/test-extraction-data/video/Makefile.am b/tests/functional-tests/test-extraction-data/video/Makefile.am
index 9814722..6f2a841 100644
--- a/tests/functional-tests/test-extraction-data/video/Makefile.am
+++ b/tests/functional-tests/test-extraction-data/video/Makefile.am
@@ -3,10 +3,10 @@ include $(top_srcdir)/Makefile.decl
 if DIST_FUNCTIONAL_TESTS
 videotestdir = $(datadir)/tracker-tests/test-extraction-data/video
 
-videotest_DATA =			\
-	video-1.mp4			\
-	video-1.expected		\
-	video-2.mov			\
+videotest_DATA =                                       \
+	video-1.mp4                                    \
+	video-1.expected                               \
+	video-2.mov                                    \
 	video-2.expected
 
 EXTRA_DIST = $(videotest_DATA)
diff --git a/tests/functional-tests/test-ontologies/Makefile.am b/tests/functional-tests/test-ontologies/Makefile.am
index 9e46734..017c8f4 100644
--- a/tests/functional-tests/test-ontologies/Makefile.am
+++ b/tests/functional-tests/test-ontologies/Makefile.am
@@ -1,12 +1,12 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = basic				\
-	property-range-int-to-string 	\
-	property-range-string-to-date 	\
-	cardinality			\
-	notify				\
-	indexed				\
-	add-class			\
-	add-prop			\
-	add-domainIndex			\
+SUBDIRS = basic                                        \
+	property-range-int-to-string                   \
+	property-range-string-to-date                  \
+	cardinality                                    \
+	notify                                         \
+	indexed                                        \
+	add-class                                      \
+	add-prop                                       \
+	add-domainIndex                                \
 	basic-future
diff --git a/tests/functional-tests/test-ontologies/add-class/Makefile.am b/tests/functional-tests/test-ontologies/add-class/Makefile.am
index b6663c3..1b7f4ae 100644
--- a/tests/functional-tests/test-ontologies/add-class/Makefile.am
+++ b/tests/functional-tests/test-ontologies/add-class/Makefile.am
@@ -2,13 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 addclassdir = $(datadir)/tracker-tests/test-ontologies/add-class
 
-addclass_DATA =		\
-	10-xsd.ontology 	\
-	11-rdf.ontology 	\
-	12-nrl.ontology 	\
-	20-dc.ontology		\
-	31-nao.ontology 	\
-	90-tracker.ontology  	\
+addclass_DATA =                                        \
+	10-xsd.ontology                                \
+	11-rdf.ontology                                \
+	12-nrl.ontology                                \
+	20-dc.ontology                                 \
+	31-nao.ontology                                \
+	90-tracker.ontology                            \
 	91-test.ontology
 
-EXTRA_DIST = $(addclass_DATA)
\ No newline at end of file
+EXTRA_DIST = $(addclass_DATA)
diff --git a/tests/functional-tests/test-ontologies/add-domainIndex/Makefile.am b/tests/functional-tests/test-ontologies/add-domainIndex/Makefile.am
index 85efe81..6dcdf80 100644
--- a/tests/functional-tests/test-ontologies/add-domainIndex/Makefile.am
+++ b/tests/functional-tests/test-ontologies/add-domainIndex/Makefile.am
@@ -2,13 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 domainindexdir = $(datadir)/tracker-tests/test-ontologies/add-domainIndex
 
-domainindex_DATA =		\
-	10-xsd.ontology 	\
-	11-rdf.ontology 	\
-	12-nrl.ontology 	\
-	20-dc.ontology		\
-	31-nao.ontology 	\
-	90-tracker.ontology  	\
+domainindex_DATA =                                     \
+	10-xsd.ontology                                \
+	11-rdf.ontology                                \
+	12-nrl.ontology                                \
+	20-dc.ontology                                 \
+	31-nao.ontology                                \
+	90-tracker.ontology                            \
 	91-test.ontology
 
-EXTRA_DIST = $(domainindex_DATA)
\ No newline at end of file
+EXTRA_DIST = $(domainindex_DATA)
diff --git a/tests/functional-tests/test-ontologies/add-prop/Makefile.am b/tests/functional-tests/test-ontologies/add-prop/Makefile.am
index c15d46b..506c763 100644
--- a/tests/functional-tests/test-ontologies/add-prop/Makefile.am
+++ b/tests/functional-tests/test-ontologies/add-prop/Makefile.am
@@ -2,13 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 addpropdir = $(datadir)/tracker-tests/test-ontologies/add-prop
 
-addprop_DATA =		\
-	10-xsd.ontology 	\
-	11-rdf.ontology 	\
-	12-nrl.ontology 	\
-	20-dc.ontology		\
-	31-nao.ontology 	\
-	90-tracker.ontology  	\
+addprop_DATA =                                         \
+	10-xsd.ontology                                \
+	11-rdf.ontology                                \
+	12-nrl.ontology                                \
+	20-dc.ontology                                 \
+	31-nao.ontology                                \
+	90-tracker.ontology                            \
 	91-test.ontology
 
-EXTRA_DIST = $(addprop_DATA)
\ No newline at end of file
+EXTRA_DIST = $(addprop_DATA)
diff --git a/tests/functional-tests/test-ontologies/basic-future/Makefile.am b/tests/functional-tests/test-ontologies/basic-future/Makefile.am
index c61db95..2106dbb 100644
--- a/tests/functional-tests/test-ontologies/basic-future/Makefile.am
+++ b/tests/functional-tests/test-ontologies/basic-future/Makefile.am
@@ -2,13 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 basicfutdir = $(datadir)/tracker-tests/test-ontologies/basic-future
 
-basicfut_DATA =			\
-	10-xsd.ontology 	\
-	11-rdf.ontology 	\
-	12-nrl.ontology 	\
-	20-dc.ontology		\
-	31-nao.ontology 	\
-	90-tracker.ontology  	\
+basicfut_DATA =                                        \
+	10-xsd.ontology                                \
+	11-rdf.ontology                                \
+	12-nrl.ontology                                \
+	20-dc.ontology                                 \
+	31-nao.ontology                                \
+	90-tracker.ontology                            \
 	91-test.ontology
 
-EXTRA_DIST = $(basicfut_DATA)
\ No newline at end of file
+EXTRA_DIST = $(basicfut_DATA)
diff --git a/tests/functional-tests/test-ontologies/basic/Makefile.am b/tests/functional-tests/test-ontologies/basic/Makefile.am
index 8034079..c6c4464 100644
--- a/tests/functional-tests/test-ontologies/basic/Makefile.am
+++ b/tests/functional-tests/test-ontologies/basic/Makefile.am
@@ -2,13 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 basicontodir = $(datadir)/tracker-tests/test-ontologies/basic
 
-basiconto_DATA =		\
-	10-xsd.ontology 	\
-	11-rdf.ontology 	\
-	12-nrl.ontology 	\
-	20-dc.ontology		\
-	31-nao.ontology 	\
-	90-tracker.ontology  	\
+basiconto_DATA =                                       \
+	10-xsd.ontology                                \
+	11-rdf.ontology                                \
+	12-nrl.ontology                                \
+	20-dc.ontology                                 \
+	31-nao.ontology                                \
+	90-tracker.ontology                            \
 	91-test.ontology
 
-EXTRA_DIST = $(basiconto_DATA)
\ No newline at end of file
+EXTRA_DIST = $(basiconto_DATA)
diff --git a/tests/functional-tests/test-ontologies/cardinality/Makefile.am b/tests/functional-tests/test-ontologies/cardinality/Makefile.am
index 35548f6..cfa00ed 100644
--- a/tests/functional-tests/test-ontologies/cardinality/Makefile.am
+++ b/tests/functional-tests/test-ontologies/cardinality/Makefile.am
@@ -2,13 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 cardinalitydir = $(datadir)/tracker-tests/test-ontologies/cardinality
 
-cardinality_DATA =		\
-	10-xsd.ontology 	\
-	11-rdf.ontology 	\
-	12-nrl.ontology 	\
-	20-dc.ontology		\
-	31-nao.ontology 	\
-	90-tracker.ontology  	\
+cardinality_DATA =                                     \
+	10-xsd.ontology                                \
+	11-rdf.ontology                                \
+	12-nrl.ontology                                \
+	20-dc.ontology                                 \
+	31-nao.ontology                                \
+	90-tracker.ontology                            \
 	91-test.ontology
 
-EXTRA_DIST = $(cardinality_DATA)
\ No newline at end of file
+EXTRA_DIST = $(cardinality_DATA)
diff --git a/tests/functional-tests/test-ontologies/indexed/Makefile.am b/tests/functional-tests/test-ontologies/indexed/Makefile.am
index ece5b3c..99f1e01 100644
--- a/tests/functional-tests/test-ontologies/indexed/Makefile.am
+++ b/tests/functional-tests/test-ontologies/indexed/Makefile.am
@@ -2,13 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 indexeddir = $(datadir)/tracker-tests/test-ontologies/indexed
 
-indexed_DATA =		\
-	10-xsd.ontology 	\
-	11-rdf.ontology 	\
-	12-nrl.ontology 	\
-	20-dc.ontology		\
-	31-nao.ontology 	\
-	90-tracker.ontology  	\
+indexed_DATA =                                         \
+	10-xsd.ontology                                \
+	11-rdf.ontology                                \
+	12-nrl.ontology                                \
+	20-dc.ontology                                 \
+	31-nao.ontology                                \
+	90-tracker.ontology                            \
 	91-test.ontology
 
-EXTRA_DIST = $(indexed_DATA)
\ No newline at end of file
+EXTRA_DIST = $(indexed_DATA)
diff --git a/tests/functional-tests/test-ontologies/notify/Makefile.am b/tests/functional-tests/test-ontologies/notify/Makefile.am
index 89e8205..a898b72 100644
--- a/tests/functional-tests/test-ontologies/notify/Makefile.am
+++ b/tests/functional-tests/test-ontologies/notify/Makefile.am
@@ -2,13 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 notifydir = $(datadir)/tracker-tests/test-ontologies/notify
 
-notify_DATA =		\
-	10-xsd.ontology 	\
-	11-rdf.ontology 	\
-	12-nrl.ontology 	\
-	20-dc.ontology		\
-	31-nao.ontology 	\
-	90-tracker.ontology  	\
+notify_DATA =                                          \
+	10-xsd.ontology                                \
+	11-rdf.ontology                                \
+	12-nrl.ontology                                \
+	20-dc.ontology                                 \
+	31-nao.ontology                                \
+	90-tracker.ontology                            \
 	91-test.ontology
 
-EXTRA_DIST = $(notify_DATA)
\ No newline at end of file
+EXTRA_DIST = $(notify_DATA)
diff --git a/tests/functional-tests/test-ontologies/property-range-int-to-string/Makefile.am b/tests/functional-tests/test-ontologies/property-range-int-to-string/Makefile.am
index 7608e09..31e6189 100644
--- a/tests/functional-tests/test-ontologies/property-range-int-to-string/Makefile.am
+++ b/tests/functional-tests/test-ontologies/property-range-int-to-string/Makefile.am
@@ -2,13 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 intontodir = $(datadir)/tracker-tests/test-ontologies/property-range-int-to-string
 
-intonto_DATA =			\
-	10-xsd.ontology 	\
-	11-rdf.ontology 	\
-	12-nrl.ontology 	\
-	20-dc.ontology		\
-	31-nao.ontology 	\
-	90-tracker.ontology  	\
+intonto_DATA =                                         \
+	10-xsd.ontology                                \
+	11-rdf.ontology                                \
+	12-nrl.ontology                                \
+	20-dc.ontology                                 \
+	31-nao.ontology                                \
+	90-tracker.ontology                            \
 	91-test.ontology
 
-EXTRA_DIST = $(intonto_DATA)
\ No newline at end of file
+EXTRA_DIST = $(intonto_DATA)
diff --git a/tests/functional-tests/test-ontologies/property-range-string-to-date/Makefile.am b/tests/functional-tests/test-ontologies/property-range-string-to-date/Makefile.am
index 5ab6b65..9006afa 100644
--- a/tests/functional-tests/test-ontologies/property-range-string-to-date/Makefile.am
+++ b/tests/functional-tests/test-ontologies/property-range-string-to-date/Makefile.am
@@ -2,13 +2,13 @@ include $(top_srcdir)/Makefile.decl
 
 dateontodir = $(datadir)/tracker-tests/test-ontologies/property-range-string-to-date
 
-dateonto_DATA =		\
-	10-xsd.ontology 	\
-	11-rdf.ontology 	\
-	12-nrl.ontology 	\
-	20-dc.ontology		\
-	31-nao.ontology 	\
-	90-tracker.ontology  	\
+dateonto_DATA =                                        \
+	10-xsd.ontology                                \
+	11-rdf.ontology                                \
+	12-nrl.ontology                                \
+	20-dc.ontology                                 \
+	31-nao.ontology                                \
+	90-tracker.ontology                            \
 	91-test.ontology
 
-EXTRA_DIST = $(dateonto_DATA)
\ No newline at end of file
+EXTRA_DIST = $(dateonto_DATA)
diff --git a/tests/functional-tests/test-writeback-data/Makefile.am b/tests/functional-tests/test-writeback-data/Makefile.am
index af00265..1747073 100644
--- a/tests/functional-tests/test-writeback-data/Makefile.am
+++ b/tests/functional-tests/test-writeback-data/Makefile.am
@@ -2,9 +2,9 @@ include $(top_srcdir)/Makefile.decl
 
 wbtestdir = $(datadir)/tracker-tests/test-writeback-data/
 
-wbtest_DATA =			\
-	writeback-test-1.jpeg	\
-	writeback-test-2.tif	\
-	writeback-test-4.png		
+wbtest_DATA =                                          \
+	writeback-test-1.jpeg                          \
+	writeback-test-2.tif                           \
+	writeback-test-4.png
 
 EXTRA_DIST = $(wbtest_DATA)
diff --git a/tests/functional-tests/ttl/Makefile.am b/tests/functional-tests/ttl/Makefile.am
index 54f508a..9912e5e 100644
--- a/tests/functional-tests/ttl/Makefile.am
+++ b/tests/functional-tests/ttl/Makefile.am
@@ -9,50 +9,49 @@ gen-test-data.stamp:
 	mv ttl/* . && rmdir ttl
 	touch gen-test-data.stamp
 
-
 ttldir = $(datadir)/tracker-tests/ttl
 
-ttl_DATA =  				\
-	010-nco_EmailAddress.ttl	\
-	011-nco_PostalAddress.ttl	\
-	012-nco_PhoneNumber.ttl		\
-	013-nco_IMAddress.ttl		\
-	014-nco_ContactEmail.ttl	\
-	015-nco_ContactCall.ttl		\
-	016-nco_ContactIM.ttl		\
-	018-nco_PersonContact.ttl	\
-	020-mlo_GeoPoint.ttl		\
-	021-mlo_LocationBoundingBox.ttl	\
-	028-mlo_GeoLocation.ttl		\
-	029-mlo_Landmark.ttl		\
-	030-nmo_MailAccount.ttl		\
-	031-nmo_MailFolder.ttl		\
-	032-nmo_Email.ttl		\
-	035-nmo_CommunicationChannel.ttl	\
-	036-nmo_IMMessage.ttl		\
-	037-nmo_SMSMessage.ttl		\
-	038-nmo_Call.ttl		\
-	040-nmm_Artist.ttl		\
-	041-nmm_MusicAlbum.ttl		\
-	042-nmm_MusicPiece.ttl		\
-	045-nmm_Photo.ttl		\
-	046-nmm_Video.ttl		\
-	050-tracker_Volume.ttl		\
-	051-nfo_PlainTextDocument.ttl	\
-	060-nfo_SoftwareCategory.ttl	\
-	061-nfo_SoftwareApplication.ttl	\
-	065-nfo_WebHistory.ttl		\
-	070-ncal_Alarm.ttl		\
-	071-ncal_Calendar.ttl		\
-	072-ncal_Event.ttl		\
-	073-ncal_Todo.ttl		\
-	080-mfo_FeedChannel.ttl		\
-	081-mfo_FeedMessage.ttl		\
-	090-mto_TransferElement.ttl	\
+ttl_DATA =                                             \
+	010-nco_EmailAddress.ttl                       \
+	011-nco_PostalAddress.ttl                      \
+	012-nco_PhoneNumber.ttl                        \
+	013-nco_IMAddress.ttl                          \
+	014-nco_ContactEmail.ttl                       \
+	015-nco_ContactCall.ttl                        \
+	016-nco_ContactIM.ttl                          \
+	018-nco_PersonContact.ttl                      \
+	020-mlo_GeoPoint.ttl                           \
+	021-mlo_LocationBoundingBox.ttl                \
+	028-mlo_GeoLocation.ttl                        \
+	029-mlo_Landmark.ttl                           \
+	030-nmo_MailAccount.ttl                        \
+	031-nmo_MailFolder.ttl                         \
+	032-nmo_Email.ttl                              \
+	035-nmo_CommunicationChannel.ttl               \
+	036-nmo_IMMessage.ttl                          \
+	037-nmo_SMSMessage.ttl                         \
+	038-nmo_Call.ttl                               \
+	040-nmm_Artist.ttl                             \
+	041-nmm_MusicAlbum.ttl                         \
+	042-nmm_MusicPiece.ttl                         \
+	045-nmm_Photo.ttl                              \
+	046-nmm_Video.ttl                              \
+	050-tracker_Volume.ttl                         \
+	051-nfo_PlainTextDocument.ttl                  \
+	060-nfo_SoftwareCategory.ttl                   \
+	061-nfo_SoftwareApplication.ttl                \
+	065-nfo_WebHistory.ttl                         \
+	070-ncal_Alarm.ttl                             \
+	071-ncal_Calendar.ttl                          \
+	072-ncal_Event.ttl                             \
+	073-ncal_Todo.ttl                              \
+	080-mfo_FeedChannel.ttl                        \
+	081-mfo_FeedMessage.ttl                        \
+	090-mto_TransferElement.ttl                    \
 	091-mto_UploadTransfer.ttl
 
-DISTCLEANFILES = 			\
-	$(BUILT_SOURCES) 		\
-	$(ttl_DATA) 			\
+DISTCLEANFILES =                                       \
+	$(BUILT_SOURCES)                               \
+	$(ttl_DATA)                                    \
 	source-data.pkl
 
diff --git a/tests/functional-tests/unittest2/Makefile.am b/tests/functional-tests/unittest2/Makefile.am
index f656c7f..62839ea 100644
--- a/tests/functional-tests/unittest2/Makefile.am
+++ b/tests/functional-tests/unittest2/Makefile.am
@@ -2,20 +2,20 @@ include $(top_srcdir)/Makefile.decl
 
 ut2dir = $(datadir)/tracker-tests/unittest2
 
-ut2_SCRIPTS = 			\
-	__init__.py		\
-	case.py			\
-	compatibility.py	\
-	loader.py		\
-	__main__.py		\
-	main.py			\
-	result.py		\
-	runner.py		\
-	signals.py		\
-	suite.py		\
-	unit2.py		\
-	unit2			\
-	util.py	
+ut2_SCRIPTS =                                          \
+	__init__.py                                    \
+	case.py                                        \
+	compatibility.py                               \
+	loader.py                                      \
+	__main__.py                                    \
+	main.py                                        \
+	result.py                                      \
+	runner.py                                      \
+	signals.py                                     \
+	suite.py                                       \
+	unit2.py                                       \
+	unit2                                          \
+	util.py
 
-EXTRA_DIST = 			\
+EXTRA_DIST =                                           \
 	$(ut2_SCRIPTS)
diff --git a/tests/libtracker-client/Makefile.am b/tests/libtracker-client/Makefile.am
index 5e9b878..72b5e26 100644
--- a/tests/libtracker-client/Makefile.am
+++ b/tests/libtracker-client/Makefile.am
@@ -2,18 +2,18 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_PROGS += 								\
+TEST_PROGS +=                                          \
 	tracker-test
 
-AM_CPPFLAGS = 								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_srcdir)/tests/common					\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_srcdir)/tests/common                   \
 	$(LIBTRACKER_CLIENT_CFLAGS)
 
-LDADD =	 								\
+LDADD =                                                \
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_CLIENT_LIBS)
 
-tracker_test_SOURCES = tracker-test.c
\ No newline at end of file
+tracker_test_SOURCES = tracker-test.c
diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-common/Makefile.am
index b12647b..f3e33f7 100644
--- a/tests/libtracker-common/Makefile.am
+++ b/tests/libtracker-common/Makefile.am
@@ -2,28 +2,28 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_PROGS += 								\
-	tracker-dbus 							\
-	tracker-type-utils 						\
-	tracker-file-utils						\
+TEST_PROGS +=                                          \
+	tracker-dbus                                   \
+	tracker-type-utils                             \
+	tracker-file-utils                             \
 	tracker-utils
 
-AM_CPPFLAGS = 								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_srcdir)/tests/common					\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_srcdir)/tests/common                   \
 	$(LIBTRACKER_COMMON_CFLAGS)
 
-LDADD =									\
-	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(BUILD_LIBS)							\
+LDADD =                                                \
+	$(top_builddir)/tests/common/libtracker-testcommon.la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_COMMON_LIBS)
 
-tracker_dbus_SOURCES = 							\
-	tracker-dbus-test.c						\
-	mock-dbus.c							\
-	mock-dbus-gproxy.h						\
+tracker_dbus_SOURCES =                                 \
+	tracker-dbus-test.c                            \
+	mock-dbus.c                                    \
+	mock-dbus-gproxy.h                             \
 	mock-dbus-gproxy.c
 
 tracker_type_utils_SOURCES = tracker-type-utils-test.c
diff --git a/tests/libtracker-data/Makefile.am b/tests/libtracker-data/Makefile.am
index d168907..6ff812e 100644
--- a/tests/libtracker-data/Makefile.am
+++ b/tests/libtracker-data/Makefile.am
@@ -1,52 +1,52 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = 					\
-	aggregates				\
-	algebra					\
-	anon					\
-	ask					\
-	basic					\
-	bnode-coreference			\
-	bound 					\
-	datetime				\
-	expr-ops				\
-	functions				\
-	graph					\
-	nie					\
-	nmo					\
-	optional				\
-	regex					\
-	sort					\
-	subqueries				\
-	error					\
-	backup					\
+SUBDIRS =                                              \
+	aggregates                                     \
+	algebra                                        \
+	anon                                           \
+	ask                                            \
+	basic                                          \
+	bnode-coreference                              \
+	bound                                          \
+	datetime                                       \
+	expr-ops                                       \
+	functions                                      \
+	graph                                          \
+	nie                                            \
+	nmo                                            \
+	optional                                       \
+	regex                                          \
+	sort                                           \
+	subqueries                                     \
+	error                                          \
+	backup                                         \
 	turtle
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_PROGS += 					\
-	tracker-sparql				\
-	tracker-sparql-blank			\
-	tracker-ontology			\
-	tracker-backup				\
-	tracker-ontology-change			\
-	tracker-db-journal			\
+TEST_PROGS +=                                          \
+	tracker-sparql                                 \
+	tracker-sparql-blank                           \
+	tracker-ontology                               \
+	tracker-backup                                 \
+	tracker-ontology-change                        \
+	tracker-db-journal                             \
 	tracker-db-dbus
 
-AM_CPPFLAGS = 					\
-	$(BUILD_CFLAGS)				\
-	-DTOP_SRCDIR=\"$(abs_top_srcdir)\"	\
-	-DTOP_BUILDDIR=\"$(abs_top_builddir)\"	\
-	-I$(top_srcdir)/src			\
-	-I$(top_builddir)/src			\
-	-I$(top_srcdir)/tests/common		\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-DTOP_SRCDIR=\"$(abs_top_srcdir)\"             \
+	-DTOP_BUILDDIR=\"$(abs_top_builddir)\"         \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-I$(top_srcdir)/tests/common                   \
 	$(LIBTRACKER_DATA_CFLAGS)
 
-LDADD =						\
+LDADD =                                                \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(top_builddir)/src/libtracker-data/libtracker-data.la \
 	$(top_builddir)/tests/common/libtracker-testcommon.la \
-	$(BUILD_LIBS)				\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_DATA_LIBS)
 
 tracker_sparql_SOURCES = tracker-sparql-test.c
@@ -57,37 +57,37 @@ tracker_backup_SOURCES = tracker-backup-test.c
 tracker_db_journal_SOURCES = tracker-db-journal.c
 tracker_db_dbus_SOURCES = tracker-db-dbus-test.c
 
-EXTRA_DIST = 					\
-	dawg-testcases				\
-	change/source/99-example.ontology.v1	\
-	change/source/99-example.ontology.v2	\
-	change/source/99-example.ontology.v3	\
-	change/source/99-example.ontology.v4	\
-	change/source/99-example.ontology.v5	\
-	change/source/99-example.ontology.v6	\
-	change/source/99-example.ontology.v7	\
-	change/test-1.out			\
-	change/test-1.rq			\
-	change/test-2.out			\
-	change/test-2.rq			\
-	change/test-3.out			\
-	change/test-3.rq			\
-	change/test-4.rq			\
-	change/test-4.out			\
-	change/test-5.out			\
-	change/test-5.rq			\
-	change/change-test-1.rq			\
-	change/change-test-1.out		\
-	change/change-test-2.rq			\
-	change/change-test-2.out		\
-	change/change-test-3.rq			\
-	change/change-test-3.out		\
-	change/updates/99-example.queries.v2	\
-	change/updates/99-example.queries.v3	\
-	change/updates/99-example.queries.v4	\
-	change/updates/99-example.queries.v5	\
-	change/updates/99-example.queries.v6	\
-	change/updates/99-example.queries.v7	\
-	ontologies/20-dc.ontology		\
-	ontologies/31-nao.ontology		\
+EXTRA_DIST =                                           \
+	dawg-testcases                                 \
+	change/source/99-example.ontology.v1           \
+	change/source/99-example.ontology.v2           \
+	change/source/99-example.ontology.v3           \
+	change/source/99-example.ontology.v4           \
+	change/source/99-example.ontology.v5           \
+	change/source/99-example.ontology.v6           \
+	change/source/99-example.ontology.v7           \
+	change/test-1.out                              \
+	change/test-1.rq                               \
+	change/test-2.out                              \
+	change/test-2.rq                               \
+	change/test-3.out                              \
+	change/test-3.rq                               \
+	change/test-4.rq                               \
+	change/test-4.out                              \
+	change/test-5.out                              \
+	change/test-5.rq                               \
+	change/change-test-1.rq                        \
+	change/change-test-1.out                       \
+	change/change-test-2.rq                        \
+	change/change-test-2.out                       \
+	change/change-test-3.rq                        \
+	change/change-test-3.out                       \
+	change/updates/99-example.queries.v2           \
+	change/updates/99-example.queries.v3           \
+	change/updates/99-example.queries.v4           \
+	change/updates/99-example.queries.v5           \
+	change/updates/99-example.queries.v6           \
+	change/updates/99-example.queries.v7           \
+	ontologies/20-dc.ontology                      \
+	ontologies/31-nao.ontology                     \
 	ontologies/90-tracker.ontology
diff --git a/tests/libtracker-data/aggregates/Makefile.am b/tests/libtracker-data/aggregates/Makefile.am
index 4433cf9..80b32f8 100644
--- a/tests/libtracker-data/aggregates/Makefile.am
+++ b/tests/libtracker-data/aggregates/Makefile.am
@@ -1,11 +1,11 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 				\
-	data-1.ontology			\
-	data-1.ttl			\
-	aggregate-1.out			\
-	aggregate-1.rq			\
-	aggregate-distinct-1.out	\
-	aggregate-distinct-1.rq		\
-	aggregate-group-1.out		\
+EXTRA_DIST =                                           \
+	data-1.ontology                                \
+	data-1.ttl                                     \
+	aggregate-1.out                                \
+	aggregate-1.rq                                 \
+	aggregate-distinct-1.out                       \
+	aggregate-distinct-1.rq                        \
+	aggregate-group-1.out                          \
 	aggregate-group-1.rq
diff --git a/tests/libtracker-data/algebra/Makefile.am b/tests/libtracker-data/algebra/Makefile.am
index ba78ebe..a30cbfe 100644
--- a/tests/libtracker-data/algebra/Makefile.am
+++ b/tests/libtracker-data/algebra/Makefile.am
@@ -1,44 +1,44 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 				\
-	data-1.ontology			\
-	data-1.ttl			\
-	data-2.ontology			\
-	data-2.ttl			\
-	filter-nested-1.out		\
-	filter-nested-1.rq		\
-	filter-nested-2.out		\
-	filter-nested-2.rq		\
-	filter-in-1.out			\
-	filter-in-1.rq			\
-	filter-in-2.out			\
-	filter-in-2.rq			\
-	filter-in-3.out			\
-	filter-in-3.rq			\
-	filter-in-4.out			\
-	filter-in-4.rq			\
-	filter-placement-1.out		\
-	filter-placement-1.rq		\
-	filter-placement-2.out		\
-	filter-placement-2.rq		\
-	filter-placement-3.out		\
-	filter-placement-3.rq		\
-	filter-placement-3a.out		\
-	filter-placement-3a.rq		\
-	filter-scope-1.out		\
-	filter-scope-1.rq		\
-	opt-filter-3.ontology		\
-	opt-filter-3.out		\
-	opt-filter-3.rq			\
-	opt-filter-3.ttl		\
-	two-nested-opt-alt.out		\
-	two-nested-opt-alt.rq		\
-	two-nested-opt.ontology		\
-	two-nested-opt.out		\
-	two-nested-opt.rq		\
-	two-nested-opt.ttl		\
-	var-scope-join-1.ontology	\
-	var-scope-join-1.out		\
-	var-scope-join-1.rq		\
+EXTRA_DIST =                                           \
+	data-1.ontology                                \
+	data-1.ttl                                     \
+	data-2.ontology                                \
+	data-2.ttl                                     \
+	filter-nested-1.out                            \
+	filter-nested-1.rq                             \
+	filter-nested-2.out                            \
+	filter-nested-2.rq                             \
+	filter-in-1.out                                \
+	filter-in-1.rq                                 \
+	filter-in-2.out                                \
+	filter-in-2.rq                                 \
+	filter-in-3.out                                \
+	filter-in-3.rq                                 \
+	filter-in-4.out                                \
+	filter-in-4.rq                                 \
+	filter-placement-1.out                         \
+	filter-placement-1.rq                          \
+	filter-placement-2.out                         \
+	filter-placement-2.rq                          \
+	filter-placement-3.out                         \
+	filter-placement-3.rq                          \
+	filter-placement-3a.out                        \
+	filter-placement-3a.rq                         \
+	filter-scope-1.out                             \
+	filter-scope-1.rq                              \
+	opt-filter-3.ontology                          \
+	opt-filter-3.out                               \
+	opt-filter-3.rq                                \
+	opt-filter-3.ttl                               \
+	two-nested-opt-alt.out                         \
+	two-nested-opt-alt.rq                          \
+	two-nested-opt.ontology                        \
+	two-nested-opt.out                             \
+	two-nested-opt.rq                              \
+	two-nested-opt.ttl                             \
+	var-scope-join-1.ontology                      \
+	var-scope-join-1.out                           \
+	var-scope-join-1.rq                            \
 	var-scope-join-1.ttl
 
diff --git a/tests/libtracker-data/anon/Makefile.am b/tests/libtracker-data/anon/Makefile.am
index 3f91c58..c1d348e 100644
--- a/tests/libtracker-data/anon/Makefile.am
+++ b/tests/libtracker-data/anon/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 	 	\
-	data.ontology	\
-	data.ttl	\
-	query.out	\
+EXTRA_DIST =                                           \
+	data.ontology                                  \
+	data.ttl                                       \
+	query.out                                      \
 	query.rq
diff --git a/tests/libtracker-data/ask/Makefile.am b/tests/libtracker-data/ask/Makefile.am
index 982188a..5b1d186 100644
--- a/tests/libtracker-data/ask/Makefile.am
+++ b/tests/libtracker-data/ask/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST =          \
-	ask-1.out     \
-	ask-1.rq      \
-	data.ontology \
+EXTRA_DIST =                                           \
+	ask-1.out                                      \
+	ask-1.rq                                       \
+	data.ontology                                  \
 	data.ttl
diff --git a/tests/libtracker-data/backup/Makefile.am b/tests/libtracker-data/backup/Makefile.am
index 51b6de8..e1fe63e 100644
--- a/tests/libtracker-data/backup/Makefile.am
+++ b/tests/libtracker-data/backup/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 			\
-	backup.ontology		\
+EXTRA_DIST =                                           \
+	backup.ontology                                \
 	backup.data
 
diff --git a/tests/libtracker-data/basic/Makefile.am b/tests/libtracker-data/basic/Makefile.am
index 6db5f39..fdebb93 100644
--- a/tests/libtracker-data/basic/Makefile.am
+++ b/tests/libtracker-data/basic/Makefile.am
@@ -1,18 +1,18 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST =                     \
-	base-prefix-3.out        \
-	base-prefix-3.rq         \
-	compare-cast.rq		 \
-	compare-cast.out	 \
-	data-1.ontology          \
-	data-1.ttl               \
-	predicate-variable.out   \
-	predicate-variable.rq    \
-	predicate-variable-2.out \
-	predicate-variable-2.rq  \
-	predicate-variable-3.out \
-	predicate-variable-3.rq  \
-	predicate-variable-4.out \
+EXTRA_DIST =                                           \
+	base-prefix-3.out                              \
+	base-prefix-3.rq                               \
+	compare-cast.rq                                \
+	compare-cast.out                               \
+	data-1.ontology                                \
+	data-1.ttl                                     \
+	predicate-variable.out                         \
+	predicate-variable.rq                          \
+	predicate-variable-2.out                       \
+	predicate-variable-2.rq                        \
+	predicate-variable-3.out                       \
+	predicate-variable-3.rq                        \
+	predicate-variable-4.out                       \
 	predicate-variable-4.rq
 
diff --git a/tests/libtracker-data/bnode-coreference/Makefile.am b/tests/libtracker-data/bnode-coreference/Makefile.am
index 3f91c58..c1d348e 100644
--- a/tests/libtracker-data/bnode-coreference/Makefile.am
+++ b/tests/libtracker-data/bnode-coreference/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 	 	\
-	data.ontology	\
-	data.ttl	\
-	query.out	\
+EXTRA_DIST =                                           \
+	data.ontology                                  \
+	data.ttl                                       \
+	query.out                                      \
 	query.rq
diff --git a/tests/libtracker-data/bound/Makefile.am b/tests/libtracker-data/bound/Makefile.am
index 7d75af3..8f5e356 100644
--- a/tests/libtracker-data/bound/Makefile.am
+++ b/tests/libtracker-data/bound/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 		\
-	bound1.out	\
-	bound1.rq	\
-	data.ontology	\
+EXTRA_DIST =                                           \
+	bound1.out                                     \
+	bound1.rq                                      \
+	data.ontology                                  \
 	data.ttl
diff --git a/tests/libtracker-data/datetime/Makefile.am b/tests/libtracker-data/datetime/Makefile.am
index 0294e67..1bb0d28 100644
--- a/tests/libtracker-data/datetime/Makefile.am
+++ b/tests/libtracker-data/datetime/Makefile.am
@@ -1,15 +1,15 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 				\
-	data-1.ontology			\
-	data-1.ttl			\
-	data-2.ontology			\
-	data-2.ttl			\
-	data-3.ontology			\
-	data-3.rq			\
-	delete-1.out			\
-	delete-1.rq			\
-	functions-localtime-1.out	\
-	functions-localtime-1.rq	\
-	functions-timezone-1.out	\
+EXTRA_DIST =                                           \
+	data-1.ontology                                \
+	data-1.ttl                                     \
+	data-2.ontology                                \
+	data-2.ttl                                     \
+	data-3.ontology                                \
+	data-3.rq                                      \
+	delete-1.out                                   \
+	delete-1.rq                                    \
+	functions-localtime-1.out                      \
+	functions-localtime-1.rq                       \
+	functions-timezone-1.out                       \
 	functions-timezone-1.rq
diff --git a/tests/libtracker-data/error/Makefile.am b/tests/libtracker-data/error/Makefile.am
index b98aeaa..59ebd72 100644
--- a/tests/libtracker-data/error/Makefile.am
+++ b/tests/libtracker-data/error/Makefile.am
@@ -1,15 +1,16 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = query-error-1.ontology \
-	query-error-1.out \
-	query-error-1.rq \
-	query-error-1.ttl \
-	query-error-2.ontology \
-	query-error-2.out \
-	query-error-2.rq \
-	query-error-2.ttl \
-	update-error-1.ontology \
-	update-error-1.rq \
-	update-error-query-1.out \
+EXTRA_DIST =                                           \ 
+	query-error-1.ontology                         \
+	query-error-1.out                              \
+	query-error-1.rq                               \
+	query-error-1.ttl                              \
+	query-error-2.ontology                         \
+	query-error-2.out                              \
+	query-error-2.rq                               \
+	query-error-2.ttl                              \
+	update-error-1.ontology                        \
+	update-error-1.rq                              \
+	update-error-query-1.out                       \
 	update-error-query-1.rq
 
diff --git a/tests/libtracker-data/expr-ops/Makefile.am b/tests/libtracker-data/expr-ops/Makefile.am
index 6395acd..72cd653 100644
--- a/tests/libtracker-data/expr-ops/Makefile.am
+++ b/tests/libtracker-data/expr-ops/Makefile.am
@@ -1,21 +1,21 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 			\
-	data.ontology		\
-	data.ttl		\
-	query-ge-1.out		\
-	query-ge-1.rq		\
-	query-le-1.out		\
-	query-le-1.rq		\
-	query-minus-1.out	\
-	query-minus-1.rq	\
-	query-mul-1.out		\
-	query-mul-1.rq		\
-	query-plus-1.out	\
-	query-plus-1.rq		\
-	query-unminus-1.out	\
-	query-unminus-1.rq	\
-	query-unplus-1.out	\
-	query-unplus-1.rq	\
-	query-res-1.rq		\
+EXTRA_DIST =                                           \
+	data.ontology                                  \
+	data.ttl                                       \
+	query-ge-1.out                                 \
+	query-ge-1.rq                                  \
+	query-le-1.out                                 \
+	query-le-1.rq                                  \
+	query-minus-1.out                              \
+	query-minus-1.rq                               \
+	query-mul-1.out                                \
+	query-mul-1.rq                                 \
+	query-plus-1.out                               \
+	query-plus-1.rq                                \
+	query-unminus-1.out                            \
+	query-unminus-1.rq                             \
+	query-unplus-1.out                             \
+	query-unplus-1.rq                              \
+	query-res-1.rq                                 \
 	query-res-1.out
diff --git a/tests/libtracker-data/functions/Makefile.am b/tests/libtracker-data/functions/Makefile.am
index d26a7f3..df7071e 100644
--- a/tests/libtracker-data/functions/Makefile.am
+++ b/tests/libtracker-data/functions/Makefile.am
@@ -1,29 +1,29 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 				\
-	data-1.ontology			\
-	data-1.ttl			\
-	data-2.ontology			\
-	data-2.ttl			\
-	data-3.ontology			\
-	data-3.ttl			\
-	functions-property-1.out	\
-	functions-property-1.rq		\
-	functions-tracker-1.out		\
-	functions-tracker-1.rq		\
-	functions-tracker-2.out		\
-	functions-tracker-2.rq		\
-	functions-tracker-loc-1.rq	\
-	functions-tracker-loc-1.out	\
-	functions-xpath-1.out		\
-	functions-xpath-1.rq		\
-	functions-xpath-2.out		\
-	functions-xpath-2.rq		\
-	functions-xpath-3.out		\
-	functions-xpath-3.rq		\
-	functions-xpath-4.out		\
-	functions-xpath-4.rq		\
-	functions-xpath-5.out		\
-	functions-xpath-5.rq		\
-	functions-xpath-6.rq		\
+EXTRA_DIST =                                           \
+	data-1.ontology                                \
+	data-1.ttl                                     \
+	data-2.ontology                                \
+	data-2.ttl                                     \
+	data-3.ontology                                \
+	data-3.ttl                                     \
+	functions-property-1.out                       \
+	functions-property-1.rq                        \
+	functions-tracker-1.out                        \
+	functions-tracker-1.rq                         \
+	functions-tracker-2.out                        \
+	functions-tracker-2.rq                         \
+	functions-tracker-loc-1.rq                     \
+	functions-tracker-loc-1.out                    \
+	functions-xpath-1.out                          \
+	functions-xpath-1.rq                           \
+	functions-xpath-2.out                          \
+	functions-xpath-2.rq                           \
+	functions-xpath-3.out                          \
+	functions-xpath-3.rq                           \
+	functions-xpath-4.out                          \
+	functions-xpath-4.rq                           \
+	functions-xpath-5.out                          \
+	functions-xpath-5.rq                           \
+	functions-xpath-6.rq                           \
 	functions-xpath-6.out
diff --git a/tests/libtracker-data/graph/Makefile.am b/tests/libtracker-data/graph/Makefile.am
index 453a5ca..0117dcb 100644
--- a/tests/libtracker-data/graph/Makefile.am
+++ b/tests/libtracker-data/graph/Makefile.am
@@ -1,17 +1,17 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 		\
-	data-1.ontology	\
-	data-1.rq	\
-	data-2.ontology	\
-	data-2.rq	\
-	data-3.ontology	\
-	data-3.rq	\
-	graph-1.out	\
-	graph-1.rq	\
-	graph-2.out	\
-	graph-2.rq	\
-	graph-3.out	\
-	graph-3.rq	\
-	graph-4.out	\
+EXTRA_DIST =                                           \
+	data-1.ontology                                \
+	data-1.rq                                      \
+	data-2.ontology                                \
+	data-2.rq                                      \
+	data-3.ontology                                \
+	data-3.rq                                      \
+	graph-1.out                                    \
+	graph-1.rq                                     \
+	graph-2.out                                    \
+	graph-2.rq                                     \
+	graph-3.out                                    \
+	graph-3.rq                                     \
+	graph-4.out                                    \
 	graph-4.rq
diff --git a/tests/libtracker-data/nie/Makefile.am b/tests/libtracker-data/nie/Makefile.am
index 8881500..b318500 100644
--- a/tests/libtracker-data/nie/Makefile.am
+++ b/tests/libtracker-data/nie/Makefile.am
@@ -1,30 +1,30 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 				\
-	data-1.ttl			\
-	filter-characterset-1.out	\
-	filter-characterset-1.rq	\
-	filter-comment-1.out		\
-	filter-comment-1.rq		\
-	filter-description-1.out	\
-	filter-description-1.rq		\
-	filter-generator-1.out		\
-	filter-generator-1.rq		\
-	filter-identifier-1.out		\
-	filter-identifier-1.rq		\
-	filter-keyword-1.out		\
-	filter-keyword-1.rq		\
-	filter-language-1.out		\
-	filter-language-1.rq		\
-	filter-legal-1.out		\
-	filter-legal-1.rq		\
-	filter-mimetype-1.out		\
-	filter-mimetype-1.rq		\
-	filter-plaintextcontent-1.out	\
-	filter-plaintextcontent-1.rq	\
-	filter-subject-1.out		\
-	filter-subject-1.rq		\
-	filter-title-1.out		\
-	filter-title-1.rq		\
-	filter-version-1.out		\
+EXTRA_DIST =                                           \
+	data-1.ttl                                     \
+	filter-characterset-1.out                      \
+	filter-characterset-1.rq                       \
+	filter-comment-1.out                           \
+	filter-comment-1.rq                            \
+	filter-description-1.out                       \
+	filter-description-1.rq                        \
+	filter-generator-1.out                         \
+	filter-generator-1.rq                          \
+	filter-identifier-1.out                        \
+	filter-identifier-1.rq                         \
+	filter-keyword-1.out                           \
+	filter-keyword-1.rq                            \
+	filter-language-1.out                          \
+	filter-language-1.rq                           \
+	filter-legal-1.out                             \
+	filter-legal-1.rq                              \
+	filter-mimetype-1.out                          \
+	filter-mimetype-1.rq                           \
+	filter-plaintextcontent-1.out                  \
+	filter-plaintextcontent-1.rq                   \
+	filter-subject-1.out                           \
+	filter-subject-1.rq                            \
+	filter-title-1.out                             \
+	filter-title-1.rq                              \
+	filter-version-1.out                           \
 	filter-version-1.rq
diff --git a/tests/libtracker-data/nmo/Makefile.am b/tests/libtracker-data/nmo/Makefile.am
index 99ac8f1..7ab7166 100644
--- a/tests/libtracker-data/nmo/Makefile.am
+++ b/tests/libtracker-data/nmo/Makefile.am
@@ -1,36 +1,36 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 					\
-	data-1.ttl				\
-	filter-boundary-1.out			\
-	filter-boundary-1.rq			\
-	filter-charset-1.out			\
-	filter-charset-1.rq			\
-	filter-contentdescription-1.out		\
-	filter-contentdescription-1.rq		\
-	filter-contentid-1.out			\
-	filter-contentid-1.rq			\
-	filter-contenttransferencoding-1.out	\
-	filter-contenttransferencoding-1.rq	\
-	filter-headername-1.out			\
-	filter-headername-1.rq			\
-	filter-headervalue-1.out		\
-	filter-headervalue-1.rq			\
-	filter-isanswered-1.out			\
-	filter-isanswered-1.rq			\
-	filter-isdeleted-1.out			\
-	filter-isdeleted-1.rq			\
-	filter-isdraft-1.out			\
-	filter-isdraft-1.rq			\
-	filter-isflagged-1.out			\
-	filter-isflagged-1.rq			\
-	filter-isread-1.out			\
-	filter-isread-1.rq			\
-	filter-isrecent-1.out			\
-	filter-isrecent-1.rq			\
-	filter-messageid-1.out			\
-	filter-messageid-1.rq			\
-	filter-messagesubject-1.out		\
-	filter-messagesubject-1.rq		\
-	filter-plaintextmessagecontent-1.out	\
+EXTRA_DIST =                                           \
+	data-1.ttl                                     \
+	filter-boundary-1.out                          \
+	filter-boundary-1.rq                           \
+	filter-charset-1.out                           \
+	filter-charset-1.rq                            \
+	filter-contentdescription-1.out                \
+	filter-contentdescription-1.rq                 \
+	filter-contentid-1.out                         \
+	filter-contentid-1.rq                          \
+	filter-contenttransferencoding-1.out           \
+	filter-contenttransferencoding-1.rq            \
+	filter-headername-1.out                        \
+	filter-headername-1.rq                         \
+	filter-headervalue-1.out                       \
+	filter-headervalue-1.rq                        \
+	filter-isanswered-1.out                        \
+	filter-isanswered-1.rq                         \
+	filter-isdeleted-1.out                         \
+	filter-isdeleted-1.rq                          \
+	filter-isdraft-1.out                           \
+	filter-isdraft-1.rq                            \
+	filter-isflagged-1.out                         \
+	filter-isflagged-1.rq                          \
+	filter-isread-1.out                            \
+	filter-isread-1.rq                             \
+	filter-isrecent-1.out                          \
+	filter-isrecent-1.rq                           \
+	filter-messageid-1.out                         \
+	filter-messageid-1.rq                          \
+	filter-messagesubject-1.out                    \
+	filter-messagesubject-1.rq                     \
+	filter-plaintextmessagecontent-1.out           \
 	filter-plaintextmessagecontent-1.rq
diff --git a/tests/libtracker-data/optional/Makefile.am b/tests/libtracker-data/optional/Makefile.am
index b9ef0cc..23698b8 100644
--- a/tests/libtracker-data/optional/Makefile.am
+++ b/tests/libtracker-data/optional/Makefile.am
@@ -1,11 +1,11 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 			\
-	complex-data-1.ontology	\
-	complex-data-1.ttl	\
-	q-opt-complex-1.out	\
-	q-opt-complex-1.rq	\
-	simple-optional-triple.ontology	\
-	simple-optional-triple.out	\
-	simple-optional-triple.rq	\
+EXTRA_DIST =                                           \
+	complex-data-1.ontology                        \
+	complex-data-1.ttl                             \
+	q-opt-complex-1.out                            \
+	q-opt-complex-1.rq                             \
+	simple-optional-triple.ontology                \
+	simple-optional-triple.out                     \
+	simple-optional-triple.rq                      \
 	simple-optional-triple.ttl
diff --git a/tests/libtracker-data/regex/Makefile.am b/tests/libtracker-data/regex/Makefile.am
index dc3f8e7..6ecdc25 100644
--- a/tests/libtracker-data/regex/Makefile.am
+++ b/tests/libtracker-data/regex/Makefile.am
@@ -1,9 +1,9 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 			\
-	regex-data-01.ontology	\
-	regex-data-01.ttl	\
-	regex-query-001.out	\
-	regex-query-001.rq	\
-	regex-query-002.out	\
+EXTRA_DIST =                                           \
+	regex-data-01.ontology                         \
+	regex-data-01.ttl                              \
+	regex-query-001.out                            \
+	regex-query-001.rq                             \
+	regex-query-002.out                            \
 	regex-query-002.rq
diff --git a/tests/libtracker-data/sort/Makefile.am b/tests/libtracker-data/sort/Makefile.am
index 9f3cfd6..e275ab2 100644
--- a/tests/libtracker-data/sort/Makefile.am
+++ b/tests/libtracker-data/sort/Makefile.am
@@ -1,27 +1,27 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 			\
-	data-sort-1.ontology	\
-	data-sort-1.ttl		\
-	data-sort-3.ontology	\
-	data-sort-3.ttl		\
-	data-sort-4.ontology	\
-	data-sort-4.ttl		\
-	data-sort-5.ontology	\
-	data-sort-5.ttl		\
-	query-sort-1.out	\
-	query-sort-1.rq		\
-	query-sort-2.out	\
-	query-sort-2.rq		\
-	query-sort-3.out	\
-	query-sort-3.rq		\
-	query-sort-4.out	\
-	query-sort-4.rq		\
-	query-sort-5.out	\
-	query-sort-5.rq		\
-	query-sort-6.rq		\
-	query-sort-6.out	\
-	query-sort-7.rq		\
-	query-sort-7.out	\
-	query-sort-8.rq		\
+EXTRA_DIST =                                           \
+	data-sort-1.ontology                           \
+	data-sort-1.ttl                                \
+	data-sort-3.ontology                           \
+	data-sort-3.ttl                                \
+	data-sort-4.ontology                           \
+	data-sort-4.ttl                                \
+	data-sort-5.ontology                           \
+	data-sort-5.ttl                                \
+	query-sort-1.out                               \
+	query-sort-1.rq                                \
+	query-sort-2.out                               \
+	query-sort-2.rq                                \
+	query-sort-3.out                               \
+	query-sort-3.rq                                \
+	query-sort-4.out                               \
+	query-sort-4.rq                                \
+	query-sort-5.out                               \
+	query-sort-5.rq                                \
+	query-sort-6.rq                                \
+	query-sort-6.out                               \
+	query-sort-7.rq                                \
+	query-sort-7.out                               \
+	query-sort-8.rq                                \
 	query-sort-8.out
diff --git a/tests/libtracker-data/subqueries/Makefile.am b/tests/libtracker-data/subqueries/Makefile.am
index 50e4a7e..ddcc149 100644
--- a/tests/libtracker-data/subqueries/Makefile.am
+++ b/tests/libtracker-data/subqueries/Makefile.am
@@ -1,11 +1,11 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST =                   \
-	data-1.ontology        \
-	data-1.ttl             \
-	subqueries-1.out       \
-	subqueries-1.rq        \
-	subqueries-union-1.out \
-	subqueries-union-1.rq  \
-	subqueries-union-2.out \
+EXTRA_DIST =                                           \
+	data-1.ontology                                \
+	data-1.ttl                                     \
+	subqueries-1.out                               \
+	subqueries-1.rq                                \
+	subqueries-union-1.out                         \
+	subqueries-union-1.rq                          \
+	subqueries-union-2.out                         \
 	subqueries-union-2.rq
diff --git a/tests/libtracker-data/turtle/Makefile.am b/tests/libtracker-data/turtle/Makefile.am
index 94cf3b9..209d9f8 100644
--- a/tests/libtracker-data/turtle/Makefile.am
+++ b/tests/libtracker-data/turtle/Makefile.am
@@ -1,11 +1,11 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 			 \
-	turtle-data-001.ontology \
-	turtle-data-001.ttl	 \
-	turtle-query-001.out	 \
-	turtle-query-001.rq	\
-	turtle-data-002.ontology \
-	turtle-data-002.ttl      \
-	turtle-query-002.out     \
+EXTRA_DIST =                                           \
+	turtle-data-001.ontology                       \
+	turtle-data-001.ttl                            \
+	turtle-query-001.out                           \
+	turtle-query-001.rq                            \
+	turtle-data-002.ontology                       \
+	turtle-data-002.ttl                            \
+	turtle-query-002.out                           \
 	turtle-query-002.rq
diff --git a/tests/libtracker-extract/Makefile.am b/tests/libtracker-extract/Makefile.am
index 899a3d3..ec12cda 100644
--- a/tests/libtracker-extract/Makefile.am
+++ b/tests/libtracker-extract/Makefile.am
@@ -2,22 +2,22 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_PROGS += 								\
-	tracker-test-utils						\
+TEST_PROGS +=                                          \
+	tracker-test-utils                             \
 	tracker-test-xmp
 
-AM_CPPFLAGS = 								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
-	-I$(top_srcdir)/tests/common					\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-I$(top_srcdir)/tests/common                   \
 	$(LIBTRACKER_EXTRACT_CFLAGS)
 
-LDADD =									\
-	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+LDADD =                                                \
+	$(top_builddir)/tests/common/libtracker-testcommon.la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)							\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_EXTRACT_LIBS)
 
 tracker_test_utils_SOURCES = tracker-test-utils.c
diff --git a/tests/libtracker-fts/Makefile.am b/tests/libtracker-fts/Makefile.am
index 40ae72c..695dc78 100644
--- a/tests/libtracker-fts/Makefile.am
+++ b/tests/libtracker-fts/Makefile.am
@@ -1,31 +1,31 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS =					\
-	limits					\
+SUBDIRS =                                              \
+	limits                                         \
 	prefix
 
-noinst_PROGRAMS = 				\
-	$(TEST_PROGS) 				\
+noinst_PROGRAMS =                                      \
+	$(TEST_PROGS)                                  \
 	tracker-parser
 
-TEST_PROGS += 					\
-	tracker-fts-test 			\
+TEST_PROGS +=                                          \
+	tracker-fts-test                               \
 	tracker-parser-test
 
-AM_CPPFLAGS = 					\
-	$(BUILD_CFLAGS)				\
-	-I$(top_srcdir)/src			\
-	-I$(top_builddir)/src			\
-	-I$(top_srcdir)/tests/common		\
-	-DTOP_SRCDIR=\"$(top_srcdir)\"		\
-	-DTOP_BUILDDIR=\"$(top_builddir)\" 	\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-I$(top_srcdir)/tests/common                   \
+	-DTOP_SRCDIR=\"$(top_srcdir)\"                 \
+	-DTOP_BUILDDIR=\"$(top_builddir)\"             \
 	$(LIBTRACKER_FTS_CFLAGS)
 
-LDADD =						\
+LDADD =                                                \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(top_builddir)/src/libtracker-data/libtracker-data.la \
 	$(top_builddir)/tests/common/libtracker-testcommon.la \
-	$(BUILD_LIBS)				\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_FTS_LIBS)
 
 tracker_fts_test_SOURCES = tracker-fts-test.c
@@ -34,14 +34,14 @@ tracker_parser_test_SOURCES = tracker-parser-test.c
 
 tracker_parser_SOURCES = tracker-parser.c
 
-EXTRA_DIST = 					\
-	data.ontology				\
-	fts3aa-data.rq				\
-	fts3aa-1.rq				\
-	fts3aa-1.out				\
-	fts3aa-2.rq				\
-	fts3aa-2.out				\
-	fts3ae-data.rq				\
-	fts3ae-1.rq				\
+EXTRA_DIST =                                           \
+	data.ontology                                  \
+	fts3aa-data.rq                                 \
+	fts3aa-1.rq                                    \
+	fts3aa-1.out                                   \
+	fts3aa-2.rq                                    \
+	fts3aa-2.out                                   \
+	fts3ae-data.rq                                 \
+	fts3ae-1.rq                                    \
 	fts3ae-1.out
 
diff --git a/tests/libtracker-fts/limits/Makefile.am b/tests/libtracker-fts/limits/Makefile.am
index a9f716d..cb4692e 100644
--- a/tests/libtracker-fts/limits/Makefile.am
+++ b/tests/libtracker-fts/limits/Makefile.am
@@ -1,12 +1,12 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 				\
-	fts3limits-data.rq		\
-	fts3limits-1.out		\
-	fts3limits-1.rq			\
-	fts3limits-2.out		\
-	fts3limits-2.rq			\
-	fts3limits-3.out		\
-	fts3limits-3.rq			\
-	fts3limits-4.out		\
+EXTRA_DIST =                                           \
+	fts3limits-data.rq                             \
+	fts3limits-1.out                               \
+	fts3limits-1.rq                                \
+	fts3limits-2.out                               \
+	fts3limits-2.rq                                \
+	fts3limits-3.out                               \
+	fts3limits-3.rq                                \
+	fts3limits-4.out                               \
 	fts3limits-4.rq
diff --git a/tests/libtracker-fts/prefix/Makefile.am b/tests/libtracker-fts/prefix/Makefile.am
index f4b6061..d219876 100644
--- a/tests/libtracker-fts/prefix/Makefile.am
+++ b/tests/libtracker-fts/prefix/Makefile.am
@@ -1,10 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 				\
-	fts3prefix-data.rq		\
-	fts3prefix-1.out		\
-	fts3prefix-1.rq			\
-	fts3prefix-2.out		\
-	fts3prefix-2.rq			\
-	fts3prefix-3.out		\
+EXTRA_DIST =                                           \
+	fts3prefix-data.rq                             \
+	fts3prefix-1.out                               \
+	fts3prefix-1.rq                                \
+	fts3prefix-2.out                               \
+	fts3prefix-2.rq                                \
+	fts3prefix-3.out                               \
 	fts3prefix-3.rq
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index 28f8963..bea2fc5 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -7,59 +7,59 @@ include $(top_srcdir)/src/libtracker-miner/Makefile-shared-sources.decl
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_PROGS +=									\
-	tracker-crawler-test							\
-	tracker-miner-manager-test						\
-	tracker-password-provider-test						\
-	tracker-thumbnailer-test						\
+TEST_PROGS +=                                          \
+	tracker-crawler-test                           \
+	tracker-miner-manager-test                     \
+	tracker-password-provider-test                 \
+	tracker-thumbnailer-test                       \
 	tracker-monitor-test
 
-AM_CPPFLAGS =									\
-	$(BUILD_CFLAGS)								\
-	-DTEST									\
-	-DLIBEXEC_PATH=\""$(libexecdir)"\"					\
-	-DTEST_DATA_DIR=\""$(abs_top_srcdir)/tests/libtracker-miner/data"\"	\
-	-DTEST_MINERS_DIR=\""$(abs_top_srcdir)/tests/libtracker-miner/mock-miners"\"	\
-	-I$(top_srcdir)/src							\
-	-I$(top_builddir)/src							\
-	-I$(top_srcdir)/tests/common						\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-DTEST                                         \
+	-DLIBEXEC_PATH=\""$(libexecdir)"\"             \
+	-DTEST_DATA_DIR=\""$(abs_top_srcdir)/tests/libtracker-miner/data"\" \
+	-DTEST_MINERS_DIR=\""$(abs_top_srcdir)/tests/libtracker-miner/mock-miners"\" \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-I$(top_srcdir)/tests/common                   \
 	$(LIBTRACKER_MINER_CFLAGS)
 
-LDADD =										\
+LDADD =                                                \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la		\
-	$(BUILD_LIBS)                                                           \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_MINER_LIBS)
 
-tracker_crawler_test_SOURCES =							\
+tracker_crawler_test_SOURCES =                         \
 	tracker-crawler-test.c
 
-tracker_thumbnailer_test_SOURCES =						\
-	tracker-thumbnailer-test.c						\
-	thumbnailer-mock.h							\
-	thumbnailer-mock.c							\
-	empty-gobject.h								\
+tracker_thumbnailer_test_SOURCES =                     \
+	tracker-thumbnailer-test.c                     \
+	thumbnailer-mock.h                             \
+	thumbnailer-mock.c                             \
+	empty-gobject.h                                \
 	empty-gobject.c
 
-tracker_monitor_test_SOURCES =							\
-	tracker-monitor-test.c							\
-	$(libtracker_miner_marshal_sources)					\
+tracker_monitor_test_SOURCES =                         \
+	tracker-monitor-test.c                         \
+	$(libtracker_miner_marshal_sources)            \
 	$(libtracker_miner_monitor_sources)
 
-tracker_miner_manager_test_VALASOURCES =					\
+tracker_miner_manager_test_VALASOURCES =               \
 	tracker-miner-mock.vala
 
-tracker_miner_manager_test_SOURCES =						\
-	tracker-miner-manager-test.c						\
-	miners-mock.c								\
-	miners-mock.h								\
-	$(tracker_miner_manager_test_VALASOURCES:.vala=.c)			\
-	$(tracker_miner_manager_test_VALASOURCES:.vala=.h)			\
-	empty-gobject.h								\
+tracker_miner_manager_test_SOURCES =                   \
+	tracker-miner-manager-test.c                   \
+	miners-mock.c                                  \
+	miners-mock.h                                  \
+	$(tracker_miner_manager_test_VALASOURCES:.vala=.c) \
+	$(tracker_miner_manager_test_VALASOURCES:.vala=.h) \
+	empty-gobject.h                                \
 	empty-gobject.c
 
-tracker_password_provider_test_SOURCES =					\
+tracker_password_provider_test_SOURCES =               \
 	tracker-password-provider-test.c
 
 libtracker-miner-test.vala.stamp: $(tracker_miner_manager_test_VALASOURCES)
@@ -68,16 +68,16 @@ libtracker-miner-test.vala.stamp: $(tracker_miner_manager_test_VALASOURCES)
 
 BUILT_SOURCES = libtracker-miner-test.vala.stamp
 
-MAINTAINERCLEANFILES =								\
-	libtracker-miner-test.vala.stamp					\
+MAINTAINERCLEANFILES =                                 \
+	libtracker-miner-test.vala.stamp               \
 	$(tracker_miner_manager_test_VALASOURCES:.vala=.c)
 
-EXTRA_DIST = $(tracker_miner_manager_test_VALASOURCES)				\
-	libtracker-miner-test.vala.stamp					\
-	data/empty-dir/.hidden							\
-	data/file1								\
-	data/dir/empty-dir/.hidden						\
-	data/dir/file1								\
-	data/dir/file2								\
-	mock-miners/mock-miner-1.desktop					\
+EXTRA_DIST = $(tracker_miner_manager_test_VALASOURCES) \
+	libtracker-miner-test.vala.stamp               \
+	data/empty-dir/.hidden                         \
+	data/file1                                     \
+	data/dir/empty-dir/.hidden                     \
+	data/dir/file1                                 \
+	data/dir/file2                                 \
+	mock-miners/mock-miner-1.desktop               \
 	mock-miners/mock-miner-2.desktop
diff --git a/tests/libtracker-sparql/Makefile.am b/tests/libtracker-sparql/Makefile.am
index 1003a3b..def341f 100644
--- a/tests/libtracker-sparql/Makefile.am
+++ b/tests/libtracker-sparql/Makefile.am
@@ -2,19 +2,19 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_PROGS +=					\
+TEST_PROGS +=                                          \
 	tracker-test
 
-AM_CPPFLAGS = 					\
-	$(BUILD_CFLAGS)				\
-	-I$(top_srcdir)/src			\
-	-I$(top_builddir)/src			\
-	-I$(top_srcdir)/tests/common		\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-I$(top_srcdir)/tests/common                   \
 	$(LIBTRACKER_SPARQL_CFLAGS)
 
-LDADD =						\
+LDADD =                                                \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(BUILD_LIBS)				\
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_SPARQL_LIBS)
 
 tracker_test_SOURCES = tracker-test.c
diff --git a/tests/tracker-steroids/Makefile.am b/tests/tracker-steroids/Makefile.am
index 718cc6c..2311d1e 100644
--- a/tests/tracker-steroids/Makefile.am
+++ b/tests/tracker-steroids/Makefile.am
@@ -2,22 +2,22 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_PROGS += 								\
+TEST_PROGS +=                                          \
 	tracker-test
 
-AM_CPPFLAGS = 								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
-	-I$(top_srcdir)/tests/common					\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-I$(top_srcdir)/tests/common                   \
 	$(LIBTRACKER_SPARQL_CFLAGS)
 
-LDADD = 								\
+LDADD =                                                \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_SPARQL_LIBS)
 
-tracker_test_SOURCES = 							\
+tracker_test_SOURCES =                                 \
 	tracker-test.c
 
diff --git a/tests/tracker-writeback/Makefile.am b/tests/tracker-writeback/Makefile.am
index 9e54c3c..abb16df 100644
--- a/tests/tracker-writeback/Makefile.am
+++ b/tests/tracker-writeback/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
 
 configdir = $(datadir)/tracker-tests
 
-config_SCRIPTS =		\
-	01-writeback.py		
+config_SCRIPTS =                                       \
+	01-writeback.py
 
 EXTRA_DIST = $(config_SCRIPTS)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index bcb76f2..adea88a 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,12 +1,12 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = 			\
-	gtk-sparql		\
-	lyrics			\
-	services		\
-	data-generators		\
+SUBDIRS =                                              \
+	gtk-sparql                                     \
+	lyrics                                         \
+	services                                       \
+	data-generators                                \
 	mtp
 
 if HAVE_TOTEM_PL_PARSER
 SUBDIRS += playlists
-endif
\ No newline at end of file
+endif
diff --git a/utils/data-generators/Makefile.am b/utils/data-generators/Makefile.am
index 11bfdc3..e50debc 100644
--- a/utils/data-generators/Makefile.am
+++ b/utils/data-generators/Makefile.am
@@ -1,3 +1,3 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = cc
\ No newline at end of file
+SUBDIRS = cc
diff --git a/utils/data-generators/cc/Makefile.am b/utils/data-generators/cc/Makefile.am
index e61261a..5269c85 100644
--- a/utils/data-generators/cc/Makefile.am
+++ b/utils/data-generators/cc/Makefile.am
@@ -1,21 +1,21 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 			\
-	convert_data.pyc	\
-	default.cfg		\
-	gen_data.py		\
-	generate		\
-	__init__.py		\
-	max.cfg			\
-	mfo.py			\
-	mlo.py			\
-	mto.py			\
-	ncal.py			\
-	nco.py			\
-	nfo.py			\
-	nmm.py			\
-	nmo.py			\
-	ontology_prefixes.py	\
-	tools.py		\
-	tracker.py		\
+EXTRA_DIST =                                           \
+	convert_data.pyc                               \
+	default.cfg                                    \
+	gen_data.py                                    \
+	generate                                       \
+	__init__.py                                    \
+	max.cfg                                        \
+	mfo.py                                         \
+	mlo.py                                         \
+	mto.py                                         \
+	ncal.py                                        \
+	nco.py                                         \
+	nfo.py                                         \
+	nmm.py                                         \
+	nmo.py                                         \
+	ontology_prefixes.py                           \
+	tools.py                                       \
+	tracker.py                                     \
 	source-data
diff --git a/utils/gtk-sparql/Makefile.am b/utils/gtk-sparql/Makefile.am
index 211882b..65ece9d 100644
--- a/utils/gtk-sparql/Makefile.am
+++ b/utils/gtk-sparql/Makefile.am
@@ -1,10 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 				\
-	gtk-sparql.ui			\
-	completion.py			\
-	completion_engine.py		\
-	gtk-sparql.py			\
+EXTRA_DIST =                                           \
+	gtk-sparql.ui                                  \
+	completion.py                                  \
+	completion_engine.py                           \
+	gtk-sparql.py                                  \
 	store.py
 
 CLEANFILES = *.pyc
diff --git a/utils/lyrics/Makefile.am b/utils/lyrics/Makefile.am
index e412fd1..abd3a5c 100644
--- a/utils/lyrics/Makefile.am
+++ b/utils/lyrics/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST = 				\
+EXTRA_DIST =                                           \
 	lyrics.py
 
 CLEANFILES = *.pyc
diff --git a/utils/mtp/Makefile.am b/utils/mtp/Makefile.am
index 3d6a262..8f2ab95 100644
--- a/utils/mtp/Makefile.am
+++ b/utils/mtp/Makefile.am
@@ -1,17 +1,17 @@
 include $(top_srcdir)/Makefile.decl
 
-AM_CPPFLAGS =								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
-	-DLOCALEDIR=\""$(localedir)"\" 					\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
 	$(LIBTRACKER_SPARQL_CFLAGS)
 
 noinst_PROGRAMS = mtp-dummy
 
 mtp_dummy_SOURCES = mtp-dummy.c
-mtp_dummy_LDADD =							\
+mtp_dummy_LDADD =                                      \
 	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_SPARQL_LIBS)
diff --git a/utils/playlists/Makefile.am b/utils/playlists/Makefile.am
index 8a6688e..b57cfe3 100644
--- a/utils/playlists/Makefile.am
+++ b/utils/playlists/Makefile.am
@@ -2,14 +2,14 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = playlist2ttl
 
-AM_CPPFLAGS = 				\
-	$(BUILD_CFLAGS)			\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
 	$(TOTEM_PL_PARSER_CFLAGS)
 
-LDADD =		 			\
-	$(BUILD_LIBS)			\
+LDADD =                                                \
+	$(BUILD_LIBS)                                  \
 	$(TOTEM_PL_PARSER_LIBS)
 
-playlist2ttl_SOURCES = 			\
+playlist2ttl_SOURCES =                                 \
 	playlist2ttl.c
 
diff --git a/utils/services/Makefile.am b/utils/services/Makefile.am
index d3b4077..3957643 100644
--- a/utils/services/Makefile.am
+++ b/utils/services/Makefile.am
@@ -2,17 +2,17 @@ include $(top_srcdir)/Makefile.decl
 
 noinst_PROGRAMS = ontology-validator data-validator
 
-AM_CPPFLAGS = 								\
-	$(BUILD_CFLAGS)							\
-	-I$(top_srcdir)/src						\
-	-I$(top_builddir)/src						\
-	-DTOP_SRCDIR=\"$(top_srcdir)\"					\
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DTOP_SRCDIR=\"$(top_srcdir)\"                 \
 	$(LIBTRACKER_DATA_CFLAGS)
 
-LDADD =									\
-	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(BUILD_LIBS)							\
+LDADD =                                                \
+	$(top_builddir)/src/libtracker-data/libtracker-data.la \
+	$(top_builddir)/src/libtracker-common/libtracker-common.la \
+	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_DATA_LIBS)
 
 ontology_validator_SOURCES = ontology-validator.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]