This is a manual merge of branch drop split view intro trunk.

[modest] / src / hildon2 / Makefile.am

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index d601c2d..88f6010 100644 (file)
--- 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,12 +50,18 @@ 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-hildon2-global-settings-dialog.c \
        modest-hildon2-global-settings-dialog.h \
@@ -74,6 +79,8 @@ libmodest_ui_la_SOURCES=              \
        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 \
@@ -109,14 +116,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 \
@@ -129,8 +128,6 @@ 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
@@ -147,6 +144,5 @@ EXTRA_DIST=\
        $(serviceentry_DATA) \
        $(desktopentry_DATA) \
        $(backupsettings_DATA) \
-       $(icon_26x26_DATA)     \
        $(MMC_MAPPING_FILE)    \
        $(PROVIDER_DATA_FILE)