[tracker/vala-makefiles: 12/13] build: Fixed distcheck issues

[Martyn James Russell <mr src gnome org>]

commit e504cf5ae9ac6e8c6ee2e0fa05be296a3151870b
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Nov 9 14:56:20 2010 +0000

    build: Fixed distcheck issues

 src/libtracker-client/Makefile.am                 |    2 +-
 src/libtracker-miner/Makefile-shared-sources.decl |    9 ++-
 src/libtracker-miner/Makefile.am                  |   14 ++++-
 tests/libtracker-miner/Makefile.am                |   66 ++++++++++++++-------
 4 files changed, 64 insertions(+), 27 deletions(-)
---
diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am
index be1adf5..bb553a7 100644
--- a/src/libtracker-client/Makefile.am
+++ b/src/libtracker-client/Makefile.am
@@ -61,10 +61,10 @@ BUILT_SOURCES =                                        \
 	$(dbus_sources)
 
 CLEANFILES =                                           \
+	$(vapi_DATA)                                   \
 	$(dbus_sources)
 
 MAINTAINERCLEANFILES =                                 \
-	tracker-client-$(TRACKER_API_VERSION).vapi     \
 	tracker-sparql-builder.h
 
 EXTRA_DIST =                                           \
diff --git a/src/libtracker-miner/Makefile-shared-sources.decl b/src/libtracker-miner/Makefile-shared-sources.decl
index f5830b7..c115e45 100644
--- a/src/libtracker-miner/Makefile-shared-sources.decl
+++ b/src/libtracker-miner/Makefile-shared-sources.decl
@@ -3,11 +3,16 @@
 # testers in test/libtracker-miner
 
 libtracker_miner_marshal_sources =                              \
-	$(top_builddir)/src/libtracker-miner/tracker-marshal.c	\
+	$(top_builddir)/src/libtracker-miner/tracker-marshal.c
+
+libtracker_miner_marshal_headers =                              \
 	$(top_builddir)/src/libtracker-miner/tracker-marshal.h
 
 libtracker_miner_monitor_sources =                              \
-	$(top_srcdir)/src/libtracker-miner/tracker-monitor.c    \
+	$(top_srcdir)/src/libtracker-miner/tracker-monitor.c
+
+libtracker_miner_monitor_headers =                              \
 	$(top_srcdir)/src/libtracker-miner/tracker-monitor.h
 
 
+ 
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 0c71260..2d5b3ad 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -1,8 +1,15 @@
 include $(top_srcdir)/Makefile.decl
 
 # Include list of shared sources:
-#  Defines $(libtracker_miner_marshal_sources) and
-#  $(libtracker_miner_monitor_sources)
+#  Defines:
+#    $(libtracker_miner_marshal_sources)
+#    $(libtracker_miner_marshal_headers)
+#    $(libtracker_miner_monitor_sources)
+#    $(libtracker_miner_monitor_headers)
+#
+# Headers and sources are split for the tests to build
+# with make distcheck.
+#
 include Makefile-shared-sources.decl
 
 AM_CPPFLAGS =                                          \
@@ -21,7 +28,9 @@ libtracker_minerincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtrack
 
 libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES =    \
 	$(libtracker_miner_marshal_sources)            \
+	$(libtracker_miner_marshal_headers)            \
 	$(libtracker_miner_monitor_sources)            \
+	$(libtracker_miner_monitor_headers)            \
 	tracker-crawler.c                              \
 	tracker-dbus.c                                 \
 	tracker-dbus.h                                 \
@@ -122,6 +131,7 @@ tracker-miner-web-full.xml: tracker-miner-web-glue.h
 BUILT_SOURCES =                                        \
 	$(dbus_sources)                                \
 	$(libtracker_miner_marshal_sources)            \
+	$(libtracker_miner_marshal_headers)            \
 	$(vapi_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index d3239d4..9b24595 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -1,10 +1,19 @@
 include $(top_srcdir)/Makefile.decl
 
 # Include list of shared sources:
-# Defines $(libtracker_miner_marshal_sources) and
-# $(libtracker_miner_monitor_sources)
+#  Defines:
+#    $(libtracker_miner_marshal_sources)
+#    $(libtracker_miner_marshal_headers)
+#    $(libtracker_miner_monitor_sources)
+#    $(libtracker_miner_monitor_headers)
+#
+# Headers and sources are split for the tests to build
+# with make distcheck.
+#
 include $(top_srcdir)/src/libtracker-miner/Makefile-shared-sources.decl
 
+noinst_LTLIBRARIES = libtracker-miner-tests.la
+
 noinst_PROGRAMS = $(TEST_PROGS)
 
 TEST_PROGS +=                                          \
@@ -14,10 +23,6 @@ TEST_PROGS +=                                          \
 	tracker-thumbnailer-test                       \
 	tracker-monitor-test
 
-AM_VALAFLAGS =                                         \
-	-g                                             \
-	--pkg glib-2.0 -H $(<:.vala=.h)
-
 AM_CPPFLAGS =                                          \
 	$(BUILD_CFLAGS)                                \
 	-DTEST                                         \
@@ -36,36 +41,53 @@ LDADD =                                                \
 	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_MINER_LIBS)
 
+libtracker_miner_tests_la_VALAFLAGS =                  \
+	--header tracker-miner-mock.h                  \
+	--pkg glib-2.0                                 \
+	-g
+
+libtracker_miner_tests_la_SOURCES =                    \
+	tracker-miner-mock.vala
+
 tracker_crawler_test_SOURCES =                         \
 	tracker-crawler-test.c
 
-tracker_miner_mock_SOURCES =                           \
-	tracker-miner-mock.vala
+tracker_miner_manager_test_SOURCES =                   \
+	tracker-miner-manager-test.c                   \
+	miners-mock.c                                  \
+	empty-gobject.c
 
-noinst_HEADERS =                                       \
-	thumbnailer-mock.h                             \
-	miners-mock.h                                  \
-	empty-gobject.h
+tracker_miner_manager_test_LDADD =                     \
+	libtracker-miner-tests.la                      \
+	$(LDADD)
+
+tracker_password_provider_test_SOURCES =               \
+	tracker-password-provider-test.c
+
+tracker_password_provider_test_LDADD =                 \
+	libtracker-miner-tests.la                      \
+	$(LDADD)
 
 tracker_thumbnailer_test_SOURCES =                     \
-	$(tracker_miner_mock_SOURCES)                  \
 	tracker-thumbnailer-test.c                     \
 	thumbnailer-mock.c                             \
 	empty-gobject.c
 
 tracker_monitor_test_SOURCES =                         \
-	tracker-monitor-test.c                         \
 	$(libtracker_miner_marshal_sources)            \
-	$(libtracker_miner_monitor_sources)
+	$(libtracker_miner_monitor_sources)            \
+	tracker-monitor-test.c
 
-tracker_miner_manager_test_SOURCES =                   \
-	$(tracker_miner_mock_SOURCES)                  \
-	tracker-miner-manager-test.c                   \
-	miners-mock.c                                  \
-	empty-gobject.c
+noinst_HEADERS =                                       \
+	$(libtracker_miner_marshal_headers)            \
+	$(libtracker_miner_monitor_headers)            \
+	tracker-miner-mock.h                           \
+	thumbnailer-mock.h                             \
+	miners-mock.h                                  \
+	empty-gobject.h
 
-tracker_password_provider_test_SOURCES =               \
-	tracker-password-provider-test.c
+BUILT_SOURCES =                                        \
+	libtracker_miner_tests_la_vala.stamp
 
 EXTRA_DIST =                                           \
 	data/empty-dir/.hidden                         \