Avoid wait on taking screenshot. Now it shouldn't be required.

[modest] / src / hildon2 / Makefile.am

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index 526e158..6dd61f2 100644 (file)
--- a/src/hildon2/Makefile.am
+++ b/src/hildon2/Makefile.am
@@ -27,10 +27,11 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 INCLUDES=\
+       $(LIBMODEST_DBUS_CLIENT_CFLAGS)     \
        $(MODEST_GSTUFF_CFLAGS)             \
        $(MODEST_WPEDITOR_CFLAGS)           \
        $(MODEST_PLATFORM_CFLAGS)           \
-       $(MODEST_TOOLKIT_CFLAGS)           \
+       $(MODEST_TOOLKIT_CFLAGS)            \
        $(MODEST_PLUGIN_DEFINES)            \
        $(MODEST_ABOOK_CFLAGS)              \
        $(MODEST_HILDON_HELP_CFLAGS)        \
@@ -38,6 +39,7 @@ INCLUDES=\
        $(MODEST_HILDON_MIME_CFLAGS)        \
        $(MODEST_HILDON_NOTIFY_CFLAGS)      \
        $(MODEST_LIBALARM_CFLAGS)           \
+       $(MODEST_CALENDAR_WIDGETS_CFLAGS)   \
        -I ${top_srcdir}/src/widgets        \
        -I ${top_srcdir}/src                \
        -DPREFIX=\"@prefix@\"               \
@@ -55,6 +57,7 @@ libmodest_ui_la_SOURCES=              \
        modest-default-account-settings-dialog.c \
        modest-easysetup-wizard-dialog.h modest-easysetup-wizard-dialog.c \
        modest-country-picker.h modest-country-picker.c \
+       modest-color-button.h modest-color-button.c \
        modest-provider-picker.h modest-provider-picker.c \
        modest-serversecurity-picker.h modest-serversecurity-picker.c \
        modest-servertype-picker.h modest-servertype-picker.c \
@@ -91,12 +94,6 @@ libmodest_ui_la_SOURCES=              \
        modest-connection-specific-smtp-window.c \
        modest-connection-specific-smtp-edit-window.h \
        modest-connection-specific-smtp-edit-window.c \
-       modest-osso-autosave-callbacks.c \
-       modest-osso-autosave-callbacks.h \
-       modest-osso-state-saving.c \
-       modest-osso-state-saving.h   \
-       modest-limit-retrieve-picker.h modest-limit-retrieve-picker.c \
-       modest-retrieve-picker.h modest-retrieve-picker.c \
        modest-secureauth-picker.h modest-secureauth-picker.c \
        modest-selector-picker.h modest-selector-picker.c \
        modest-hildon2-window-mgr.h modest-hildon2-window-mgr.c
@@ -119,7 +116,9 @@ libmodest_ui_la_LIBADD = \
        $(MODEST_LIBCONIC_LIBS) \
        $(MODEST_HILDON_HELP_LIBS) \
        $(MODEST_LIBALARM_LIBS)   \
-       $(MODEST_HILDON_NOTIFY_LIBS)
+       $(MODEST_LIBIPHB_LIBS)   \
+       $(MODEST_HILDON_NOTIFY_LIBS) \
+       $(MODEST_CALENDAR_WIDGETS_LIBS)
 
 UI_FILES=\
        ui/modest-main-window-ui.xml \
@@ -132,17 +131,16 @@ ui_DATA = $(UI_FILES)
 serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
+prebackup_SCRIPTS = modest-prebackup.sh
+restore_SCRIPTS = modest-restore.sh
 ossocudscripts_SCRIPTS = modest-clean.sh
 
-PROVIDER_DATA_FILE=maemo-provider-data.keyfile
-providerdatadir=$(datadir)/modest/provider-data
-providerdata_DATA = $(PROVIDER_DATA_FILE)
-
 EXTRA_DIST=\
        $(UI_FILES) \
        $(PIXMAP_FILES) \
        $(serviceentry_DATA) \
        $(desktopentry_DATA) \
        $(backupsettings_DATA) \
-       $(ossocudscripts_SCRIPTS) \
-       $(PROVIDER_DATA_FILE)
+       $(prebackup_SCRIPTS) \
+       $(restore_SCRIPTS) \
+       $(ossocudscripts_SCRIPTS)