Make sure that all timeouts in HildonBanner are removed

[hildon] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3af5ef6..8994907 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,25 @@
-if BUILD_TESTS 
+MAINTAINERCLEANFILES                                   = Makefile.in
+INCLUDES                                               = -I$(top_srcdir)
+
+if BUILD_TESTS
 
 noinst_PROGRAMS                                = check_test
+TESTS                                  = check_test
 
-check_test_SOURCES                     = check_test.c                          \
+tests                                  = check_test.c                          \
                                          check_utils.c                         \
-                                         check-hildon-range-editor.c           \
+                                         check-hildon-caption.c                \
+                                         check-hildon-helper.c                 \
+                                         check-hildon-note.c                   \
+                                         check-hildon-banner.c                 \
+                                         check-hildon-wizard-dialog.c          \
+                                         check-hildon-find-toolbar.c           \
+                                         check-hildon-window.c                 \
+                                         check-hildon-program.c                \
+                                         check-hildon-picker-button.c
+
+
+DEPRECATED_TESTS                       = check-hildon-range-editor.c           \
                                          check-hildon-date-editor.c            \
                                          check-hildon-time-editor.c            \
                                          check-hildon-weekday-picker.c         \
@@ -13,24 +28,27 @@ check_test_SOURCES                  = check_test.c                          \
                                          check-hildon-time-picker.c            \
                                          check-hildon-number-editor.c          \
                                          check-hildon-calendar-popup.c         \
-                                         check-hildon-caption.c                \
-                                         check-hildon-defines.c                \
                                          check-hildon-code-dialog.c            \
-                                         check-hildon-find-toolbar.c           \
                                          check-hildon-sort-dialog.c            \
-                                         check-hildon-note.c                   \
                                          check-hildon-volumebar.c              \
                                          check-hildon-volumebar-range.c        \
-                                         check-hildon-banner.c                 \
-                                         check-hildon-wizard-dialog.c          \
                                          check-hildon-font-selection-dialog.c  \
-                                         check-hildon-window.c                 \
-                                         check-hildon-program.c                \
                                          check-hildon-color-button.c           \
                                          check-hildon-color-chooser.c
 
+if HILDON_DISABLE_DEPRECATED
+check_test_SOURCES                     = $(tests)
+else
+check_test_SOURCES                     = $(tests)                              \
+                                         $(DEPRECATED_TESTS)
+endif
+
+check_test_SOURCES                    += test_suites.h                         \
+                                         check_utils.h
+
 check_test_LDADD                       = $(HILDON_OBJ_LIBS)
 check_test_LDFLAGS                     = -module -avoid-version
-check_test_CFLAGS                      = $(HILDON_OBJ_CFLAGS) 
+check_test_CFLAGS                      = $(HILDON_OBJ_CFLAGS)                  \
+                                         $(EXTRA_CFLAGS)
 
 endif