X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2FMakefile.am;h=4e017e56d3a6b8003623c06228310d40201036e0;hb=afa0056e1dda60a53fb70d4dc2de1b3c978333bf;hp=f184fd214e8bf803ae36576ec14038a95f9c89d0;hpb=0a7c11e4ab92b8ad12116a699620739f55b2b619;p=modest

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index f184fd2..4e017e5 100644
--- 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-country-picker.h modest-country-picker.c \
 	modest-provider-picker.h modest-provider-picker.c \
-	modest-easysetup-servertype-combo-box.h modest-easysetup-servertype-combo-box.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 \
@@ -79,7 +96,12 @@ libmodest_ui_la_SOURCES=              \
 	modest-osso-state-saving.c \
 	modest-osso-state-saving.h   \
 	modest-presets.h modest-presets.c \
-	modest-selector-picker.h modest-selector-picker.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
+
 
 if MODEST_USE_DUMMY_ADDRESS_BOOK
 #	 nothing 
@@ -100,14 +122,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 \
@@ -119,8 +133,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
+ossocudscripts_SCRIPTS = modest-clean.sh
 
 # 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
@@ -138,6 +151,6 @@ EXTRA_DIST=\
 	$(serviceentry_DATA) \
 	$(desktopentry_DATA) \
 	$(backupsettings_DATA) \
-	$(icon_26x26_DATA)     \
+	$(ossocudscripts_SCRIPTS) \
 	$(MMC_MAPPING_FILE)    \
 	$(PROVIDER_DATA_FILE)