Fix tests build during make distcheck

* tests/Makefile.am: Include top_srcdir to make possible to build
tests in a different builddir.
* tests/*.c: Include <hildon/hildon-*.h> to allow building tests
on a different builddir.

diff --git a/ChangeLog b/ChangeLog
index 810268e..0e56c95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-13  Claudio Saavedra  <csaavedra@igalia.com>
+
+       * tests/Makefile.am: Include top_srcdir to make possible to build
+       tests in a different builddir.
+       * tests/*.c: Include <hildon/hildon-*.h> to allow building tests
+       on a different builddir.
+
 2009-05-12  Claudio Saavedra  <csaavedra@igalia.com>
 
        * hildon/hildon-touch-selector.c (disconnect_model_handlers),

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 12d7db7..8994907 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,5 @@
 MAINTAINERCLEANFILES                                   = Makefile.in
+INCLUDES                                               = -I$(top_srcdir)
 
 if BUILD_TESTS
 

diff --git a/tests/check-hildon-banner.c b/tests/check-hildon-banner.c
index 25399f3..4bc40d7 100644 (file)
--- a/tests/check-hildon-banner.c
+++ b/tests/check-hildon-banner.c
@@ -27,8 +27,8 @@
 #include <gtk/gtkmain.h>
 #include "test_suites.h"
 #include "check_utils.h"
-#include "hildon-banner.h"
-#include "hildon-window.h"
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-window.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-calendar-popup.c b/tests/check-hildon-calendar-popup.c
index b832713..50f03d1 100644 (file)
--- a/tests/check-hildon-calendar-popup.c
+++ b/tests/check-hildon-calendar-popup.c
@@ -29,7 +29,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-calendar-popup.h"
+#include <hildon/hildon-calendar-popup.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-caption.c b/tests/check-hildon-caption.c
index 7d2d6fd..9c8203e 100644 (file)
--- a/tests/check-hildon-caption.c
+++ b/tests/check-hildon-caption.c
@@ -31,10 +31,10 @@
 #include <gtk/gtkwindow.h>
 #include "test_suites.h"
 #include "check_utils.h"
-#include "hildon-caption.h"
+#include <hildon/hildon-caption.h>
 
 #include <gtk/gtkvbox.h>
-#include "hildon-window.h"
+#include <hildon/hildon-window.h>
 
 #include <libintl.h>
 

diff --git a/tests/check-hildon-code-dialog.c b/tests/check-hildon-code-dialog.c
index 6cd8851..aea147e 100644 (file)
--- a/tests/check-hildon-code-dialog.c
+++ b/tests/check-hildon-code-dialog.c
@@ -31,7 +31,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-code-dialog.h"
+#include <hildon/hildon-code-dialog.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-color-button.c b/tests/check-hildon-color-button.c
index 4751865..4edfeec 100644 (file)
--- a/tests/check-hildon-color-button.c
+++ b/tests/check-hildon-color-button.c
@@ -29,7 +29,7 @@
 #include <glib/gprintf.h>
 #include "test_suites.h"
 #include "check_utils.h"
-#include "hildon-color-button.h"
+#include <hildon/hildon-color-button.h>
 
 /* -------------------- Fixtures -------------------- */
 static HildonColorButton *color_button = NULL;

diff --git a/tests/check-hildon-color-chooser.c b/tests/check-hildon-color-chooser.c
index ab673bf..71e77f4 100644 (file)
--- a/tests/check-hildon-color-chooser.c
+++ b/tests/check-hildon-color-chooser.c
@@ -28,8 +28,8 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-color-chooser.h"
-#include "hildon-window.h"
+#include <hildon/hildon-color-chooser.h>
+#include <hildon/hildon-window.h>
 
 #define MAX_COLOR 65535
 

diff --git a/tests/check-hildon-controlbar.c b/tests/check-hildon-controlbar.c
index fce94dd..e0be7f9 100644 (file)
--- a/tests/check-hildon-controlbar.c
+++ b/tests/check-hildon-controlbar.c
@@ -28,7 +28,7 @@
 #include <gtk/gtkcontainer.h>
 #include "test_suites.h"
 #include "check_utils.h"
-#include "hildon-controlbar.h"
+#include <hildon/hildon-controlbar.h>
 
 /* -------------------- Fixtures -------------------- */
 static HildonControlbar *controlbar = NULL;

diff --git a/tests/check-hildon-date-editor.c b/tests/check-hildon-date-editor.c
index 0195e6b..ea953d5 100644 (file)
--- a/tests/check-hildon-date-editor.c
+++ b/tests/check-hildon-date-editor.c
@@ -29,7 +29,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-date-editor.h"
+#include <hildon/hildon-date-editor.h>
 
 /* Taken from the values of the properties of HildonDateEditor */
 #define MAX_YEAR 2037

diff --git a/tests/check-hildon-dialoghelp.c b/tests/check-hildon-dialoghelp.c
index aa2a0bd..a004031 100644 (file)
--- a/tests/check-hildon-dialoghelp.c
+++ b/tests/check-hildon-dialoghelp.c
@@ -31,7 +31,7 @@
 #include "check_utils.h"
 
 #include <gdk/gdkx.h>
-#include "hildon-dialoghelp.h"
+#include <hildon/hildon-dialoghelp.h>
 
 /* -------------------- Fixtures -------------------- */
 static GtkWidget * dialoghelp = NULL;

diff --git a/tests/check-hildon-find-toolbar.c b/tests/check-hildon-find-toolbar.c
index bb8569f..5b74605 100644 (file)
--- a/tests/check-hildon-find-toolbar.c
+++ b/tests/check-hildon-find-toolbar.c
@@ -29,8 +29,8 @@
 #include "check_utils.h"
 #include <string.h>
 
-#include "hildon-find-toolbar.h"
-#include "hildon-window.h"
+#include <hildon/hildon-find-toolbar.h>
+#include <hildon/hildon-window.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-font-selection-dialog.c b/tests/check-hildon-font-selection-dialog.c
index a73bcc0..c71915a 100644 (file)
--- a/tests/check-hildon-font-selection-dialog.c
+++ b/tests/check-hildon-font-selection-dialog.c
@@ -30,7 +30,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-font-selection-dialog.h"
+#include <hildon/hildon-font-selection-dialog.h>
 
 #define PREVIEW_TEXT TEST_STRING
 #define DEFAULT_FONT_FAMILY "Sans"

diff --git a/tests/check-hildon-get-password-dialog.c b/tests/check-hildon-get-password-dialog.c
index ae9eb49..8349b1e 100644 (file)
--- a/tests/check-hildon-get-password-dialog.c
+++ b/tests/check-hildon-get-password-dialog.c
@@ -28,7 +28,7 @@
 #include <gtk/gtkmain.h>
 #include "test_suites.h"
 #include "check_utils.h"
-#include "hildon-get-password-dialog.h"
+#include <hildon/hildon-get-password-dialog.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-helper.c b/tests/check-hildon-helper.c
index 85c4e89..c82748f 100644 (file)
--- a/tests/check-hildon-helper.c
+++ b/tests/check-hildon-helper.c
@@ -27,7 +27,7 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtklabel.h>
 #include "test_suites.h"
-#include "hildon-helper.h"
+#include <hildon/hildon-helper.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-name-password-dialog.c b/tests/check-hildon-name-password-dialog.c
index 73c162b..1a65ac5 100644 (file)
--- a/tests/check-hildon-name-password-dialog.c
+++ b/tests/check-hildon-name-password-dialog.c
@@ -27,8 +27,8 @@
 #include <gtk/gtkmain.h>
 #include "test_suites.h"
 #include "check_utils.h"
-#include "hildon-name-password-dialog.h"
-#include "hildon-window.h"
+#include <hildon/hildon-name-password-dialog.h>
+#include <hildon/hildon-window.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-note.c b/tests/check-hildon-note.c
index e0c0d4f..1d4dc47 100644 (file)
--- a/tests/check-hildon-note.c
+++ b/tests/check-hildon-note.c
@@ -27,8 +27,8 @@
 #include <check.h>
 #include <gtk/gtkmain.h>
 #include "test_suites.h"
-#include "hildon-window.h"
-#include "hildon-note.h"
+#include <hildon/hildon-window.h>
+#include <hildon/hildon-note.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-number-editor.c b/tests/check-hildon-number-editor.c
index 1541c2f..994574f 100644 (file)
--- a/tests/check-hildon-number-editor.c
+++ b/tests/check-hildon-number-editor.c
@@ -29,7 +29,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-number-editor.h"
+#include <hildon/hildon-number-editor.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-picker-button.c b/tests/check-hildon-picker-button.c
index b6d89bd..59bfa52 100644 (file)
--- a/tests/check-hildon-picker-button.c
+++ b/tests/check-hildon-picker-button.c
@@ -26,7 +26,7 @@
 #include <gtk/gtkmain.h>
 #include "test_suites.h"
 #include "check_utils.h"
-#include "hildon.h"
+#include <hildon/hildon.h>
 
 static HildonButton *button = NULL;
 static HildonTouchSelector *selector = NULL;

diff --git a/tests/check-hildon-program.c b/tests/check-hildon-program.c
index db554fd..bb5364d 100644 (file)
--- a/tests/check-hildon-program.c
+++ b/tests/check-hildon-program.c
@@ -28,7 +28,7 @@
 #include <gtk/gtklabel.h>
 #include "test_suites.h"
 
-#include "hildon-program.h"
+#include <hildon/hildon-program.h>
 
 
 /* -------------------- Fixtures -------------------- */

diff --git a/tests/check-hildon-range-editor.c b/tests/check-hildon-range-editor.c
index 1256378..cc1f214 100644 (file)
--- a/tests/check-hildon-range-editor.c
+++ b/tests/check-hildon-range-editor.c
@@ -28,7 +28,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-range-editor.h"
+#include <hildon/hildon-range-editor.h>
 #include <unistd.h>
 
 /* -------------------- Fixtures -------------------- */

diff --git a/tests/check-hildon-scroll-area.c b/tests/check-hildon-scroll-area.c
index 5c72918..1405cff 100644 (file)
--- a/tests/check-hildon-scroll-area.c
+++ b/tests/check-hildon-scroll-area.c
@@ -40,7 +40,7 @@
 #include <glib/gprintf.h>
 #include "test_suites.h"
 
-#include "hildon-scroll-area.h"
+#include <hildon/hildon-scroll-area.h>
 
 enum
   {

diff --git a/tests/check-hildon-seekbar.c b/tests/check-hildon-seekbar.c
index c4e4ffc..bb53c98 100644 (file)
--- a/tests/check-hildon-seekbar.c
+++ b/tests/check-hildon-seekbar.c
@@ -30,7 +30,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-seekbar.h"
+#include <hildon/hildon-seekbar.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-set-password-dialog.c b/tests/check-hildon-set-password-dialog.c
index 5a62a06..73ca67d 100644 (file)
--- a/tests/check-hildon-set-password-dialog.c
+++ b/tests/check-hildon-set-password-dialog.c
@@ -29,8 +29,8 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-set-password-dialog.h"
-#include "hildon-window.h"
+#include <hildon/hildon-set-password-dialog.h>
+#include <hildon/hildon-window.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-sort-dialog.c b/tests/check-hildon-sort-dialog.c
index ce482bb..06a5fb7 100644 (file)
--- a/tests/check-hildon-sort-dialog.c
+++ b/tests/check-hildon-sort-dialog.c
@@ -28,7 +28,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-sort-dialog.h"
+#include <hildon/hildon-sort-dialog.h>
 
 #define SORT_KEY_0 "maemo"
 #define SORT_KEY_1 TEST_STRING

diff --git a/tests/check-hildon-system-sound.c b/tests/check-hildon-system-sound.c
index 6740b57..79951a6 100644 (file)
--- a/tests/check-hildon-system-sound.c
+++ b/tests/check-hildon-system-sound.c
@@ -27,7 +27,7 @@
 #include <gtk/gtkmain.h>
 #include <gconf/gconf-client.h>
 #include "test_suites.h"
-#include "hildon-system-sound.h"
+#include <hildon/hildon-system-sound.h>
 
 /* This define was copied from the hildon-system-sound.c */
 #define ALARM_GCONF_PATH "/apps/osso/sound/system_alert_volume"

diff --git a/tests/check-hildon-time-editor.c b/tests/check-hildon-time-editor.c
index 4ffddf8..26a6a7a 100644 (file)
--- a/tests/check-hildon-time-editor.c
+++ b/tests/check-hildon-time-editor.c
@@ -32,7 +32,7 @@
 
 #include <unistd.h>
 
-#include "hildon-time-editor.h"
+#include <hildon/hildon-time-editor.h>
 
 #define MIN_DURATION 0
 #define MAX_DURATION 359999

diff --git a/tests/check-hildon-time-picker.c b/tests/check-hildon-time-picker.c
index 017161b..7dfacb0 100644 (file)
--- a/tests/check-hildon-time-picker.c
+++ b/tests/check-hildon-time-picker.c
@@ -27,8 +27,8 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-window.h"
-#include "hildon-time-picker.h"
+#include <hildon/hildon-window.h>
+#include <hildon/hildon-time-picker.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-volumebar-range.c b/tests/check-hildon-volumebar-range.c
index a5be512..921ef0a 100644 (file)
--- a/tests/check-hildon-volumebar-range.c
+++ b/tests/check-hildon-volumebar-range.c
@@ -28,7 +28,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-volumebar-range.h"
+#include <hildon/hildon-volumebar-range.h>
 
 /* Copied from hildon-volumebar-range.h because
    there is no way to retrieve this values */

diff --git a/tests/check-hildon-volumebar.c b/tests/check-hildon-volumebar.c
index 2220167..1bc03c2 100644 (file)
--- a/tests/check-hildon-volumebar.c
+++ b/tests/check-hildon-volumebar.c
@@ -28,10 +28,10 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-window.h"
-#include "hildon-volumebar.h"
-#include "hildon-hvolumebar.h"
-#include "hildon-vvolumebar.h"
+#include <hildon/hildon-window.h>
+#include <hildon/hildon-volumebar.h>
+#include <hildon/hildon-hvolumebar.h>
+#include <hildon/hildon-vvolumebar.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-weekday-picker.c b/tests/check-hildon-weekday-picker.c
index 8bbc1b0..e641805 100644 (file)
--- a/tests/check-hildon-weekday-picker.c
+++ b/tests/check-hildon-weekday-picker.c
@@ -28,9 +28,9 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-weekday-picker.h"
-#include "hildon-window.h"
-#include "hildon-caption.h"
+#include <hildon/hildon-weekday-picker.h>
+#include <hildon/hildon-window.h>
+#include <hildon/hildon-caption.h>
 
 /* -------------------- Fixtures -------------------- */
 

diff --git a/tests/check-hildon-window.c b/tests/check-hildon-window.c
index f0f4a1e..32ba41c 100644 (file)
--- a/tests/check-hildon-window.c
+++ b/tests/check-hildon-window.c
@@ -32,7 +32,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-window.h"
+#include <hildon/hildon-window.h>
 
 
 /* -------------------- Fixtures -------------------- */

diff --git a/tests/check-hildon-wizard-dialog.c b/tests/check-hildon-wizard-dialog.c
index f204c05..684a7db 100644 (file)
--- a/tests/check-hildon-wizard-dialog.c
+++ b/tests/check-hildon-wizard-dialog.c
@@ -31,7 +31,7 @@
 #include "test_suites.h"
 #include "check_utils.h"
 
-#include "hildon-wizard-dialog.h"
+#include <hildon/hildon-wizard-dialog.h>
 
 #define DEFAULT_NOTEBOOK_PAGES 3
 

diff --git a/tests/check_utils.c b/tests/check_utils.c
index 010c54f..37321d7 100644 (file)
--- a/tests/check_utils.c
+++ b/tests/check_utils.c
@@ -25,7 +25,7 @@
 #include <gtk/gtkmain.h>
 
 #include "check_utils.h"
-#include "hildon-window.h"
+#include <hildon/hildon-window.h>
 
 /**
  * Creates a window of a fixed, well known size