X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2FMakefile.am;h=5224c136f18844ef2975c8f3e9853f5447998320;hb=266e59ba330fbca5c32475b5696ec2e28a99ede6;hp=580c5548fb65a09db713e728d48ea4e40f8244ac;hpb=d16c1640bfa41e05b9e6073e3c73ce41afcffcca;p=modest

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index 580c554..5224c13 100644
--- a/src/hildon2/Makefile.am
+++ b/src/hildon2/Makefile.am
@@ -27,6 +27,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 INCLUDES=\
+	$(LIBMODEST_DBUS_CLIENT_CFLAGS) \
 	$(MODEST_GSTUFF_CFLAGS)             \
 	$(MODEST_WPEDITOR_CFLAGS)           \
 	$(MODEST_PLATFORM_CFLAGS)           \
@@ -65,6 +66,8 @@ libmodest_ui_la_SOURCES=              \
 	modest-icon-names.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       \
@@ -75,6 +78,8 @@ libmodest_ui_la_SOURCES=              \
 	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         \
@@ -91,9 +96,6 @@ 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-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
@@ -116,6 +118,7 @@ libmodest_ui_la_LIBADD = \
 	$(MODEST_LIBCONIC_LIBS) \
 	$(MODEST_HILDON_HELP_LIBS) \
 	$(MODEST_LIBALARM_LIBS)   \
+	$(MODEST_LIBIPHB_LIBS)   \
 	$(MODEST_HILDON_NOTIFY_LIBS)
 
 UI_FILES=\
@@ -129,16 +132,9 @@ ui_DATA = $(UI_FILES)
 serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
-
-# 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) \
@@ -146,5 +142,6 @@ EXTRA_DIST=\
 	$(serviceentry_DATA) \
 	$(desktopentry_DATA) \
 	$(backupsettings_DATA) \
-	$(MMC_MAPPING_FILE)    \
-	$(PROVIDER_DATA_FILE)
+	$(prebackup_SCRIPTS) \
+	$(restore_SCRIPTS) \
+	$(ossocudscripts_SCRIPTS)
\ No newline at end of file