[evolution-data-server] Add missing CFLAGS/LIBS in the tests/ Makefile.am-s



commit f89eb23f574898dc422a085119668da6ec8e3b78
Author: Milan Crha <mcrha redhat com>
Date:   Tue Nov 5 22:55:40 2013 +0100

    Add missing CFLAGS/LIBS in the tests/ Makefile.am-s
    
    If the libical is installed in a different prefix than the one shared
    by other CFLAGS, then the test compilation breaks due to failed search
    for the <libical/ical.h> include file.

 tests/book-migration/Makefile.am    |    2 ++
 tests/libebook/Makefile.am          |    2 ++
 tests/libebook/client/Makefile.am   |    2 ++
 tests/libedata-book/Makefile.am     |    2 ++
 tests/libedataserver/Makefile.am    |    2 ++
 tests/test-server-utils/Makefile.am |    2 ++
 6 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/tests/book-migration/Makefile.am b/tests/book-migration/Makefile.am
index ad8005f..5afd5ee 100644
--- a/tests/book-migration/Makefile.am
+++ b/tests/book-migration/Makefile.am
@@ -23,6 +23,7 @@ TEST_CPPFLAGS =                                                       \
        -DEDS_TEST_SQLITE_BOOKS=\""$(abs_top_srcdir)/tests/book-migration/db"\" \
        -DEDS_TEST_BUILT_BOOKS=\""$(abs_top_builddir)/tests/book-migration/db"\" \
        $(EVOLUTION_ADDRESSBOOK_CFLAGS)                         \
+       $(EVOLUTION_CALENDAR_CFLAGS)                            \
        $(CAMEL_CFLAGS)                                         \
        $(NULL)
 
@@ -42,6 +43,7 @@ TEST_LIBS =                           \
        $(top_builddir)/tests/libebook/client/libclient-test-utils.la   \
        $(top_builddir)/private/libedbus-private.la             \
        $(EVOLUTION_ADDRESSBOOK_LIBS)                           \
+       $(EVOLUTION_CALENDAR_LIBS)                              \
        $(CAMEL_LIBS)                                           \
        $(NULL)
 
diff --git a/tests/libebook/Makefile.am b/tests/libebook/Makefile.am
index dc3663d..5f6a65a 100644
--- a/tests/libebook/Makefile.am
+++ b/tests/libebook/Makefile.am
@@ -19,6 +19,7 @@ libebook_test_utils_la_CPPFLAGS = \
        -I$(top_builddir)/tests/test-server-utils   \
        -DSRCDIR=\""$(abs_srcdir)"\"    \
        $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+       $(EVOLUTION_CALENDAR_CFLAGS) \
        $(CAMEL_CFLAGS) \
        $(NULL)
 
@@ -26,6 +27,7 @@ libebook_test_utils_la_LIBADD = \
        $(top_builddir)/addressbook/libebook/libebook-1.2.la    \
        $(top_builddir)/tests/test-server-utils/libetestserverutils.la  \
        $(EVOLUTION_ADDRESSBOOK_LIBS)                           \
+       $(EVOLUTION_CALENDAR_LIBS)                           \
        $(CAMEL_LIBS) \
        $(NULL)
 
diff --git a/tests/libebook/client/Makefile.am b/tests/libebook/client/Makefile.am
index 92d4460..de75b55 100644
--- a/tests/libebook/client/Makefile.am
+++ b/tests/libebook/client/Makefile.am
@@ -16,6 +16,7 @@ libclient_test_utils_la_CPPFLAGS =                            \
        -I$(top_builddir)/private                               \
        -DSRCDIR=\""$(abs_srcdir)"\"                            \
        $(EVOLUTION_ADDRESSBOOK_CFLAGS)                         \
+       $(EVOLUTION_CALENDAR_CFLAGS)                            \
        $(CAMEL_CFLAGS)                                         \
        $(NULL)
 
@@ -24,6 +25,7 @@ libclient_test_utils_la_LIBADD =                              \
        $(top_builddir)/tests/test-server-utils/libetestserverutils.la  \
        $(top_builddir)/private/libedbus-private.la             \
        $(EVOLUTION_ADDRESSBOOK_LIBS)                           \
+       $(EVOLUTION_CALENDAR_LIBS)                              \
        $(CAMEL_LIBS)                                           \
        $(NULL)
 
diff --git a/tests/libedata-book/Makefile.am b/tests/libedata-book/Makefile.am
index 75324f4..bce27fa 100644
--- a/tests/libedata-book/Makefile.am
+++ b/tests/libedata-book/Makefile.am
@@ -25,6 +25,7 @@ libdata_test_utils_la_CPPFLAGS =                              \
        -DSRCDIR=\""$(abs_srcdir)"\"                            \
        -DBUILDDIR=\""$(abs_topbuilddir)"\"                     \
        $(EVOLUTION_ADDRESSBOOK_CFLAGS)                         \
+       $(EVOLUTION_CALENDAR_CFLAGS)                            \
        $(GIO_UNIX_CFLAGS)                                      \
        $(CAMEL_CFLAGS)                                         \
        $(NULL)
@@ -36,6 +37,7 @@ libdata_test_utils_la_LIBADD =                                \
        $(top_builddir)/tests/test-server-utils/libetestserverutils.la  \
        $(top_builddir)/private/libedbus-private.la             \
        $(EVOLUTION_ADDRESSBOOK_LIBS)                           \
+       $(EVOLUTION_CALENDAR_LIBS)                              \
        $(GIO_UNIX_LIBS)                                        \
        $(CAMEL_LIBS)                                           \
        $(NULL)
diff --git a/tests/libedataserver/Makefile.am b/tests/libedataserver/Makefile.am
index e1f151f..77b688d 100644
--- a/tests/libedataserver/Makefile.am
+++ b/tests/libedataserver/Makefile.am
@@ -22,6 +22,7 @@ test_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"e-data-server\" \
        -DDATADIR=\"$(datadir)\" \
        $(E_DATA_SERVER_CFLAGS) \
+       $(EVOLUTION_CALENDAR_CFLAGS) \
        $(GIO_UNIX_CFLAGS) \
        $(NULL)
 
@@ -31,6 +32,7 @@ test_LDADD = \
        $(top_builddir)/calendar/libecal/libecal-1.2.la \
        $(top_builddir)/tests/test-server-utils/libetestserverutils.la \
        $(E_DATA_SERVER_LIBS) \
+       $(EVOLUTION_CALENDAR_LIBS) \
        $(GIO_UNIX_LIBS) \
        $(NULL)
 
diff --git a/tests/test-server-utils/Makefile.am b/tests/test-server-utils/Makefile.am
index ae90c80..4a14936 100644
--- a/tests/test-server-utils/Makefile.am
+++ b/tests/test-server-utils/Makefile.am
@@ -21,6 +21,7 @@ common_cflags = \
        -DEDS_TEST_REGISTRY_DIR=\""$(abs_top_builddir)/modules/cache-reaper/.libs"\" \
        -DEDS_TEST_CAMEL_DIR=\""$(abs_top_builddir)/camel/providers/local/.libs"\" \
        $(E_DATA_SERVER_CFLAGS) \
+       $(EVOLUTION_CALENDAR_CFLAGS) \
        $(GIO_UNIX_CFLAGS) \
        $(NULL)
 
@@ -29,6 +30,7 @@ common_libs = \
        $(top_builddir)/addressbook/libebook/libebook-1.2.la \
        $(top_builddir)/calendar/libecal/libecal-1.2.la \
        $(E_DATA_SERVER_LIBS) \
+       $(EVOLUTION_CALENDAR_LIBS) \
        $(GIO_UNIX_LIBS) \
        $(NULL)
 


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