diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 14 | ||||
-rw-r--r-- | tests/ui-tests/Makefile.am | 11 |
2 files changed, 19 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 7f5873ea53..441837288d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \ LDADD = \ $(top_builddir)/camel/libcamel.la \ $(GNOME_LIBDIR) \ - $(GNOMEUI_LIBS) $(INTLLIBS) $(PTHREAD_LIB) $(EXTRA_GNOME_LIBS_THREADS) + $(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS) # $(BONOBO_LIBS) @@ -22,7 +22,13 @@ test9_LDADD = \ $(top_builddir)/camel/libcamel.la \ $(top_builddir)/camel/providers/mbox/libcamelmbox.la \ $(GNOME_LIBDIR) \ - $(GNOMEUI_LIBS) $(INTLLIBS) $(PTHREAD_LIB) $(EXTRA_GNOME_LIBS_THREADS) + $(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS) + +if ENABLE_THREADS +THREAD_RELATED_TESTS=test8 +else +THREAD_RELATED_TESTS= +endif noinst_PROGRAMS = \ @@ -30,7 +36,7 @@ noinst_PROGRAMS = \ test2 \ test3 \ test7 \ - test8 \ test9 \ test10 \ - test-formatter + test-formatter \ + $(THREAD_RELATED_TESTS) diff --git a/tests/ui-tests/Makefile.am b/tests/ui-tests/Makefile.am index 34c05f3115..b81b0e8f0d 100644 --- a/tests/ui-tests/Makefile.am +++ b/tests/ui-tests/Makefile.am @@ -20,7 +20,14 @@ message_browser_LDADD = \ $(INTLLIBS) \ $(EXTRA_GNOME_LIBS) \ $(PTHREAD_LIB) \ - $(EXTRA_GNOME_LIBS_THREADS) + $(EXTRA_GNOME_LIBS) + +camelfilter_LDADD = \ + $(top_builddir)/camel/libcamel.la \ + $(INTLLIBS) \ + $(EXTRA_GNOME_LIBS) \ + $(PTHREAD_LIB) \ + $(EXTRA_GNOME_LIBS) noinst_PROGRAMS = \ - message-browser + message-browser camelfilter |