Osso-backup support: instead of backing up the .modest folder, backup a tar.gz (fixes...

[modest] / src / hildon2 / Makefile.am

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index d35d0c4..41f782b 100644 (file)
--- a/src/hildon2/Makefile.am
+++ b/src/hildon2/Makefile.am
@@ -31,6 +31,7 @@ INCLUDES=\
        $(MODEST_WPEDITOR_CFLAGS)           \
        $(MODEST_PLATFORM_CFLAGS)           \
        $(MODEST_TOOLKIT_CFLAGS)           \
+       $(MODEST_PLUGIN_DEFINES)            \
        $(MODEST_ABOOK_CFLAGS)              \
        $(MODEST_HILDON_HELP_CFLAGS)        \
        $(MODEST_LIBCONIC_CFLAGS)           \
@@ -41,7 +42,6 @@ INCLUDES=\
        -I ${top_srcdir}/src                \
        -DPREFIX=\"@prefix@\"               \
        -DMAEMO_CHANGES                     \
-       -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
        -DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \
        -Wall
 
@@ -50,26 +50,43 @@ noinst_LTLIBRARIES=\
 
 libmodest_ui_la_SOURCES=              \
        modest-account-view-window.c  \
+       modest-accounts-window.c \
+       modest-accounts-window.h \
        modest-default-account-settings-dialog.c \
        modest-easysetup-wizard-dialog.h modest-easysetup-wizard-dialog.c \
-       modest-easysetup-country-combo-box.h modest-easysetup-country-combo-box.c \
-       modest-easysetup-provider-combo-box.h modest-easysetup-provider-combo-box.c \
-       modest-easysetup-servertype-combo-box.h modest-easysetup-servertype-combo-box.c \
+       modest-country-picker.h modest-country-picker.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 \
+       modest-folder-window.c \
+       modest-folder-window.h \
+       modest-header-window.c \
+       modest-header-window.h \
        modest-icon-names.h           \
-       modest-maemo-global-settings-dialog.c \
-       modest-maemo-global-settings-dialog.h \
+       modest-hildon2-global-settings-dialog.c \
+       modest-hildon2-global-settings-dialog.h \
+       modest-wp-text-view.c \
+       modest-wp-text-view.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-hildon2-details-dialog.h \
+       modest-hildon2-details-dialog.c \
+       modest-hildon2-sort-dialog.c   \
+       modest-hildon2-sort-dialog.h   \
+       modest-hildon2-window.h \
+       modest-hildon2-window.c \
+       modest-mailboxes-window.c \
+       modest-mailboxes-window.h \
        modest-platform.c             \
        modest-signature-editor-dialog.c         \
        modest-signature-editor-dialog.h         \
        modest-msg-view-window.c      \
        modest-msg-edit-window.c      \
        modest-maemo-utils.c          \
+       modest-number-editor.c        \
+       modest-number-editor.h        \
        modest-connection-specific-smtp-window.h \
        modest-connection-specific-smtp-window.c \
        modest-connection-specific-smtp-edit-window.h \
@@ -78,7 +95,10 @@ libmodest_ui_la_SOURCES=              \
        modest-osso-autosave-callbacks.h \
        modest-osso-state-saving.c \
        modest-osso-state-saving.h   \
-       modest-presets.h modest-presets.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
+
 
 if MODEST_USE_DUMMY_ADDRESS_BOOK
 #       nothing 
@@ -99,14 +119,6 @@ libmodest_ui_la_LIBADD = \
        $(MODEST_LIBALARM_LIBS)   \
        $(MODEST_HILDON_NOTIFY_LIBS)
 
-PIXMAP_FILES=\
-       pixmaps/*.png 
-
-pixmapdir = $(datadir)/pixmaps/modest
-pixmap_DATA = $(PIXMAP_FILES)
-
-
-
 UI_FILES=\
        ui/modest-main-window-ui.xml \
        ui/modest-msg-edit-window-ui.xml \
@@ -118,18 +130,9 @@ ui_DATA = $(UI_FILES)
 serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
-
-icon_26x26_DATA     = pixmaps/modest-icon.png
-
-# mcc_mapping may be provided by the operator-wizard-settings package:
-# the one here is a copy, as that package is not available in chinook
-MMC_MAPPING_FILE=mcc_mapping
-mmccmappingdir=$(datadir)/modest/provider-data
-mmccmapping_DATA = $(MMC_MAPPING_FILE)
-
-PROVIDER_DATA_FILE=maemo-provider-data.keyfile
-providerdatadir=$(datadir)/modest/provider-data
-providerdata_DATA = $(PROVIDER_DATA_FILE)
+prebackup_SCRIPTS = modest-prebackup.sh
+restore_SCRIPTS = modest-restore.sh
+ossocudscripts_SCRIPTS = modest-clean.sh
 
 EXTRA_DIST=\
        $(UI_FILES) \
@@ -137,6 +140,6 @@ EXTRA_DIST=\
        $(serviceentry_DATA) \
        $(desktopentry_DATA) \
        $(backupsettings_DATA) \
-       $(icon_26x26_DATA)     \
-       $(MMC_MAPPING_FILE)    \
-       $(PROVIDER_DATA_FILE)
+       $(prebackup_SCRIPTS) \
+       $(restore_SCRIPTS) \
+       $(ossocudscripts_SCRIPTS)
\ No newline at end of file