Add support for cud scripts in maemo and hildon2 (fixes NB#87448)

[modest] / src / maemo / Makefile.am

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index f55596d..004fc45 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -32,8 +32,9 @@ INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)             \
        $(MODEST_WPEDITOR_CFLAGS)           \
        $(MODEST_PLATFORM_CFLAGS)           \
+       $(MODEST_TOOLKIT_CFLAGS)           \
+       $(MODEST_PLUGIN_DEFINES)            \
        $(MODEST_ABOOK_CFLAGS)              \
-       $(MODEST_HILDON_WIDGETS_CFLAGS)     \
        $(MODEST_HILDON_HELP_CFLAGS)        \
        $(MODEST_LIBCONIC_CFLAGS)           \
        $(MODEST_HILDON_MIME_CFLAGS)        \
@@ -52,13 +53,16 @@ noinst_LTLIBRARIES=\
 
 libmodest_ui_la_SOURCES=              \
        modest-account-view-window.c  \
-       modest-account-settings-dialog.c \
+       modest-default-account-settings-dialog.c \
        modest-icon-names.h           \
        modest-maemo-global-settings-dialog.c \
        modest-maemo-global-settings-dialog.h \
+       modest-maemo-security-options-view.c \
        modest-main-window.c          \
        modest-main-window-ui.h       \
        modest-hildon-includes.h      \
+       modest-hildon-sort-dialog.c   \
+       modest-hildon-sort-dialog.h   \
        modest-platform.c             \
        modest-signature-editor-dialog.c         \
        modest-signature-editor-dialog.h         \
@@ -85,8 +89,8 @@ libmodest_ui_la_LIBADD = \
        $(MODEST_GSTUFF_LIBS) \
        $(MODEST_ABOOK_LIBS) \
        $(MODEST_PLATFORM_LIBS) \
+       $(MODEST_TOOLKIT_LIBS) \
        $(MODEST_WPEDITOR_LIBS) \
-       $(MODEST_HILDON_WIDGETS_LIBS) \
        $(MODEST_HILDON_MIME_LIBS) \
        $(MODEST_LIBCONIC_LIBS) \
        $(MODEST_HILDON_HELP_LIBS) \
@@ -113,6 +117,7 @@ ui_DATA = $(UI_FILES)
 serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
+ossocudscripts_DATA = modest-clean.sh
 
 icon_26x26_DATA     = pixmaps/modest-icon.png
 
@@ -122,4 +127,5 @@ EXTRA_DIST=\
        $(serviceentry_DATA) \
        $(desktopentry_DATA) \
        $(backupsettings_DATA) \
+       $(ossocudscripts_DATA) \
        $(icon_26x26_DATA)