Index: src/tracker-indexer/Makefile.am
===================================================================
--- src/tracker-indexer/Makefile.am	(Revision 2736)
+++ src/tracker-indexer/Makefile.am	(Arbeitskopie)
@@ -46,7 +46,8 @@
 	tracker-main.c							\
 	tracker-module-metadata-private.h				\
 	tracker-marshal-main.c						\
-	tracker-removable-device.c					
+	tracker-removable-device.c					\
+	tracker-removable-device.h					
 
 tracker_indexer_LDADD =							\
 	libtracker-module.la						\
@@ -65,23 +66,11 @@
 	-lz								\
 	-lm
 
-#
-# Note: This rule is slightly different from the normal rule we would
-# use here because it copies the resulting file on success to the
-# tracker-indexer directory in the unit tests so that they can build.
-# We do this for the marshal generated source and for the dbus
-# generated glue files.
-#
-# Should we add the files for the unit tests to CLEANFILES?
-#
-
 tracker-marshal.h: tracker-marshal.list
-	$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@ && \
-	$(LN_S) -sf $(top_srcdir)/src/tracker-indexer/$@ $(top_srcdir)/tests/tracker-indexer/$@
+	$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
 
 tracker-marshal.c: tracker-marshal.list
-	$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body > $@ && 	\
-	$(LN_S) -sf $(top_srcdir)/src/tracker-indexer/$@ $(top_srcdir)/tests/tracker-indexer/$@
+	$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --body > $@
 
 tracker-marshal-main.c: tracker-marshal.c tracker-marshal.h
 
@@ -93,8 +82,7 @@
 	tracker-indexer-glue.h
 
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
-	$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^ && \
-	$(LN_S) -sf $(top_srcdir)/src/tracker-indexer/$@ $(top_srcdir)/tests/tracker-indexer/$@
+	$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
 
 BUILT_SOURCES = 							\
 	$(dbus_sources)							\
@@ -102,6 +90,4 @@
 
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = 								\
-	$(BUILT_SOURCES)						\
-	tracker-marshal.list
+EXTRA_DIST = tracker-marshal.list
Index: src/trackerd/Makefile.am
===================================================================
--- src/trackerd/Makefile.am	(Revision 2736)
+++ src/trackerd/Makefile.am	(Arbeitskopie)
@@ -126,7 +126,5 @@
 
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = 								\
-	$(BUILT_SOURCES)						\
-	tracker-marshal.list
+EXTRA_DIST = tracker-marshal.list
 
Index: src/libtracker-common/Makefile.am
===================================================================
--- src/libtracker-common/Makefile.am	(Revision 2736)
+++ src/libtracker-common/Makefile.am	(Arbeitskopie)
@@ -102,6 +102,4 @@
 
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = 						\
-	$(BUILT_SOURCES)				\
-	tracker-marshal.list
+EXTRA_DIST = tracker-marshal.list
Index: tests/tracker-indexer/Makefile.am
===================================================================
--- tests/tracker-indexer/Makefile.am	(Revision 2736)
+++ tests/tracker-indexer/Makefile.am	(Arbeitskopie)
@@ -1,12 +1,11 @@
 include $(top_srcdir)/Makefile.decl
 
-noinst_PROGRAMS = $(TEST_SETUP) $(TEST_PROGS)
+noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_SETUP  = $(generated_files)
 TEST_PROGS += tracker-metadata-utils
 
 INCLUDES = 								\
-	-g -DTEST							\
+	-DTEST								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\"	\
 	-DLIBDIR=\""$(libdir)"\"					\
@@ -14,6 +13,7 @@
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
+	-I$(top_builddir)/src/tracker-indexer				\
 	$(DBUS_CFLAGS)							\
 	$(PANGO_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
@@ -21,26 +21,18 @@
 	$(RAPTOR_CFLAGS)						\
 	$(GLIB2_CFLAGS)
 
-tracker_metadata_utils_SOURCES = 					\
-	tracker-dbus.c							\
-	tracker-dbus.h							\
-	tracker-indexer.c						\
-	tracker-indexer.h						\
-	tracker-indexer-module.c					\
-	tracker-indexer-module.h					\
-	tracker-marshal-main.c						\
-	tracker-module-metadata.c					\
-	tracker-module-metadata.h					\
-	tracker-module-metadata-private.h				\
-	tracker-module-metadata-utils.c 				\
-	tracker-module-metadata-utils.h 				\
-	tracker-metadata-utils-test.c 					\
-	tracker-module-file.c						\
-	tracker-module-file.h						\
-	tracker-module-iteratable.c					\
-	tracker-module-iteratable.h					\
-	tracker-removable-device.c					\
-	tracker-removable-device.h
+tracker_metadata_utils_SOURCES = 						\
+	$(top_srcdir)/src/tracker-indexer/tracker-dbus.c			\
+	$(top_srcdir)/src/tracker-indexer/tracker-indexer.c			\
+	$(top_srcdir)/src/tracker-indexer/tracker-indexer-module.c		\
+	$(top_srcdir)/src/tracker-indexer/tracker-marshal-main.c		\
+	$(top_srcdir)/src/tracker-indexer/tracker-module-metadata.c		\
+	$(top_srcdir)/src/tracker-indexer/tracker-module-metadata.h		\
+	$(top_srcdir)/src/tracker-indexer/tracker-module-metadata-utils.c 	\
+	$(top_srcdir)/src/tracker-indexer/tracker-module-file.c			\
+	$(top_srcdir)/src/tracker-indexer/tracker-module-iteratable.c		\
+	$(top_srcdir)/src/tracker-indexer/tracker-removable-device.c		\
+	tracker-metadata-utils-test.c 					
 
 tracker_metadata_utils_LDADD =	                                        \
 	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
@@ -54,22 +46,3 @@
 	$(GIO_LIBS)							\
 	$(RAPTOR_LIBS)							\
 	$(GLIB2_LIBS)							
-
-#
-# We don't add these to CLEANFILES because they are created from
-# src/tracker-indexer and will be overwritten when we rebuild from
-# there. 
-#
-marshal_sources =                                         		\
-        tracker-marshal.h                             			\
-        tracker-marshal.c
-
-dbus_sources = 								\
-	tracker-indexer-glue.h
-
-BUILT_SOURCES = 							\
-	$(dbus_sources)							\
-	$(marshal_sources)
-
-EXTRA_DIST = 								\
-	$(BUILT_SOURCES)
Index: tests/common/Makefile.am
===================================================================
--- tests/common/Makefile.am	(Revision 2736)
+++ tests/common/Makefile.am	(Arbeitskopie)
@@ -4,7 +4,6 @@
 
 INCLUDES = 				\
 	-DTEST_TEXT=\""$(top_srcdir)"/tests/libtracker-common/non-utf8.txt\"	\
-	-I.				\
 	$(GLIB2_CFLAGS)
 
 libtracker_testcommon_la_SOURCES = 	\
Index: configure.ac
===================================================================
--- configure.ac	(Revision 2736)
+++ configure.ac	(Arbeitskopie)
@@ -1104,30 +1104,6 @@
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
 
-####################################################################
-# Set up symbolic links
-####################################################################
-
-AC_CONFIG_LINKS(tests/tracker-indexer/tracker-dbus.c:src/tracker-indexer/tracker-dbus.c
-                tests/tracker-indexer/tracker-dbus.h:src/tracker-indexer/tracker-dbus.h
-                tests/tracker-indexer/tracker-indexer.c:src/tracker-indexer/tracker-indexer.c
-                tests/tracker-indexer/tracker-indexer.h:src/tracker-indexer/tracker-indexer.h
-                tests/tracker-indexer/tracker-indexer-module.c:src/tracker-indexer/tracker-indexer-module.c
-                tests/tracker-indexer/tracker-indexer-module.h:src/tracker-indexer/tracker-indexer-module.h
-                tests/tracker-indexer/tracker-marshal-main.c:src/tracker-indexer/tracker-marshal-main.c
-                tests/tracker-indexer/tracker-module-metadata.c:src/tracker-indexer/tracker-module-metadata.c
-                tests/tracker-indexer/tracker-module-metadata.h:src/tracker-indexer/tracker-module-metadata.h
-                tests/tracker-indexer/tracker-module-metadata-private.h:src/tracker-indexer/tracker-module-metadata-private.h
-                tests/tracker-indexer/tracker-module-metadata-utils.c:src/tracker-indexer/tracker-module-metadata-utils.c
-                tests/tracker-indexer/tracker-module-metadata-utils.h:src/tracker-indexer/tracker-module-metadata-utils.h
-                tests/tracker-indexer/tracker-module-file.c:src/tracker-indexer/tracker-module-file.c
-                tests/tracker-indexer/tracker-module-file.h:src/tracker-indexer/tracker-module-file.h
-                tests/tracker-indexer/tracker-module-iteratable.c:src/tracker-indexer/tracker-module-iteratable.c
-                tests/tracker-indexer/tracker-module-iteratable.h:src/tracker-indexer/tracker-module-iteratable.h
-		tests/tracker-indexer/tracker-removable-device.c:src/tracker-indexer/tracker-removable-device.c
-		tests/tracker-indexer/tracker-removable-device.h:src/tracker-indexer/tracker-removable-device.h
-)
-
 ##################################################################
 # Check for older tracker project files which can cause problems
 ##################################################################