[evolution-data-server] Fix distcheck errors.

[Matthew Barnes <mbarnes src gnome org>]

commit 4c7f6a0e121cbb9fd44858da04a950782cfbc987
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Jan 22 22:08:16 2010 -0500

    Fix distcheck errors.

 addressbook/tests/ebook/Makefile.am        |   19 +++++++++++++------
 addressbook/tests/ebook/ebook-test-utils.c |    2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/addressbook/tests/ebook/Makefile.am b/addressbook/tests/ebook/Makefile.am
index cf04e2d..32c8e40 100644
--- a/addressbook/tests/ebook/Makefile.am
+++ b/addressbook/tests/ebook/Makefile.am
@@ -3,12 +3,13 @@ libebook_test_utils_la_SOURCES = ebook-test-utils.c ebook-test-utils.h
 
 # FIXME: reduct redundancy
 libebook_test_utils_la_CPPFLAGS = \
-        $(AM_CPPFLAGS)                  \
-        -I$(top_srcdir)                 \
-        -I$(top_builddir)               \
-        -I$(top_srcdir)/addressbook     \
-        -I$(top_builddir)/addressbook   \
-        $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(AM_CPPFLAGS)                  \
+	-I$(top_srcdir)                 \
+	-I$(top_builddir)               \
+	-I$(top_srcdir)/addressbook     \
+	-I$(top_builddir)/addressbook   \
+	-DSRCDIR=\""$(srcdir)"\"        \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	$(NULL)
 
 libebook_test_utils_la_LIBADD = \
@@ -62,6 +63,12 @@ TEST_CPPFLAGS= \
 	$(libebook_test_utils_la_CPPFLAGS) \
 	$(NULL)
 
+EXTRA_DIST = \
+	$(srcdir)/data/vcards/name-only.vcf	\
+	$(srcdir)/data/vcards/simple-1.vcf	\
+	$(srcdir)/data/vcards/simple-2.vcf	\
+	$(NULL)
+
 test_search_LDADD=$(TEST_LIBS)
 test_search_CPPFLAGS=$(TEST_CPPFLAGS)
 test_date_LDADD=$(TEST_LIBS)
diff --git a/addressbook/tests/ebook/ebook-test-utils.c b/addressbook/tests/ebook/ebook-test-utils.c
index d47fc58..eee6d78 100644
--- a/addressbook/tests/ebook/ebook-test-utils.c
+++ b/addressbook/tests/ebook/ebook-test-utils.c
@@ -50,7 +50,7 @@ ebook_test_utils_new_vcard_from_test_case (const gchar *case_name)
         gchar *vcard;
 
         case_filename = g_strdup_printf ("%s.vcf", case_name);
-        filename = g_build_filename (EBOOK_TEST_UTILS_DATA_DIR, EBOOK_TEST_UTILS_VCARDS_DIR, case_filename, NULL);
+        filename = g_build_filename (SRCDIR, EBOOK_TEST_UTILS_DATA_DIR, EBOOK_TEST_UTILS_VCARDS_DIR, case_filename, NULL);
         file = g_file_new_for_path (filename);
         if (!g_file_load_contents (file, NULL, &vcard, NULL, NULL, &error)) {
                 g_warning ("failed to read test contact file '%s': %s",