diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-01-22 22:08:16 -0500 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-01-22 22:08:16 -0500 |
| commit | 4c7f6a0e121cbb9fd44858da04a950782cfbc987 (patch) | |
| tree | 6524ebce57da5f9054a4288da7b255f70c07f277 | |
| parent | 94c5307c7a55c912f14bc3b5369082f077955ccc (diff) | |
| download | evolution-data-server-4c7f6a0e121cbb9fd44858da04a950782cfbc987.tar.gz | |
Fix distcheck errors.
| -rw-r--r-- | addressbook/tests/ebook/Makefile.am | 19 | ||||
| -rw-r--r-- | 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 cf04e2d75..32c8e4061 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 d47fc5878..eee6d78b6 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", |