X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2FMakefile.am;h=e0786003199d979d11fa65bb2245989fbc95432e;hp=28cb1cb67feff8d36969ad0c1871785fb7d8986e;hb=03f20a5e06f43b43765ca16f2ac482eb558ed845;hpb=564a7388a2f74368147b0a241ca4a0b65c68167f

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index 28cb1cb..e078600 100644
--- a/src/hildon2/Makefile.am
+++ b/src/hildon2/Makefile.am
@@ -42,7 +42,6 @@ INCLUDES=\
 	-I ${top_srcdir}/src                \
 	-DPREFIX=\"@prefix@\" 	            \
 	-DMAEMO_CHANGES                     \
-	-DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
 	-DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \
 	-Wall
 
@@ -51,15 +50,23 @@ 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-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       \
@@ -68,12 +75,18 @@ libmodest_ui_la_SOURCES=              \
 	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 \
@@ -82,7 +95,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 \
@@ -109,14 +121,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 \
@@ -128,18 +132,7 @@ 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)
+ossocudscripts_SCRIPTS = modest-clean.sh
 
 EXTRA_DIST=\
 	$(UI_FILES) \
@@ -147,6 +140,4 @@ EXTRA_DIST=\
 	$(serviceentry_DATA) \
 	$(desktopentry_DATA) \
 	$(backupsettings_DATA) \
-	$(icon_26x26_DATA)     \
-	$(MMC_MAPPING_FILE)    \
-	$(PROVIDER_DATA_FILE)
+	$(ossocudscripts_SCRIPTS)
\ No newline at end of file