X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2FMakefile.am;h=73720f2eb6575e1ed86e50a152e0fb00abeb145c;hb=fcbac814e10741c98a721bf4198b4238d64e57d8;hp=9ed8a587dcb3a12a99025f1ed0bd4fefe5cd3aac;hpb=04bcdb4f80ae5bd55cb659940572ceb0fc1d58cc;p=modest

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index 9ed8a58..73720f2 100644
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -31,7 +31,6 @@ SUBDIRS=easysetup
 INCLUDES=\
 	$(MODEST_GSTUFF_CFLAGS) \
 	$(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
-	-DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
 	-I ${top_srcdir}/src/widgets  \
 	-I ${top_srcdir}/src  \
 	-DPREFIX=\"@prefix@\" \
@@ -47,9 +46,16 @@ libmodest_ui_la_SOURCES=              \
 	modest-account-view-window.c  \
 	modest-address-book.c	      \
 	modest-icon-names.h           \
+	modest-maemo-global-settings-dialog.c \
+	modest-maemo-global-settings-dialog.h \
 	modest-main-window.c          \
 	modest-main-window-ui.h       \
+	modest-hildon-includes.h      \
 	modest-platform.c	      \
+	modest-signature-editor-dialog.c         \
+	modest-signature-editor-dialog.h         \
+	modest-scroll-area.h          \
+	modest-scroll-area.c          \
 	modest-store-widget.c         \
 	modest-store-widget.h         \
 	modest-transport-widget.c     \
@@ -57,16 +63,24 @@ libmodest_ui_la_SOURCES=              \
 	modest-msg-view-window.c      \
 	modest-msg-edit-window.c      \
 	modest-maemo-utils.c          \
-	modest-account-settings.h \
-	modest-account-settings.c \
+	modest-account-settings-dialog.h \
+	modest-account-settings-dialog.c \
 	modest-connection-specific-smtp-window.h \
 	modest-connection-specific-smtp-window.c \
 	modest-connection-specific-smtp-edit-window.h \
-	modest-connection-specific-smtp-edit-window.c
+	modest-connection-specific-smtp-edit-window.c \
+	modest-progress-bar-widget.c      \
+	modest-progress-bar-widget.h \
+	modest-osso-autosave-callbacks.c \
+	modest-osso-autosave-callbacks.h \
+	modest-osso-state-saving.c \
+	modest-osso-state-saving.h   
 
-LDADD = \
+
+libmodest_ui_la_LIBADD = \
 	$(MODEST_GSTUFF_LIBS) \
-	$(MODEST_LIBTINYMAIL_MAEMO_LIBS)
+	$(MODEST_LIBTINYMAIL_MAEMO_LIBS) \
+	easysetup/libmodest-easysetup.la 
 
 PIXMAP_FILES=\
 	pixmaps/*.png 
@@ -74,16 +88,19 @@ PIXMAP_FILES=\
 pixmapdir = $(datadir)/pixmaps/modest
 pixmap_DATA = $(PIXMAP_FILES)
 
+
+
 UI_FILES=\
 	ui/modest-main-window-ui.xml \
 	ui/modest-msg-edit-window-ui.xml \
 	ui/modest-msg-view-window-ui.xml
-		
+
 uidir = $(datadir)/modest/ui
 ui_DATA = $(UI_FILES)
 
-serviceentry_DATA = modest.service
-desktopentry_DATA = modest.desktop
+serviceentry_DATA   = com.nokia.modest.service
+desktopentry_DATA   = modest.desktop
+backupsettings_DATA = modest.conf
 
 icon_26x26_DATA    = pixmaps/modest-icon.png
 
@@ -92,4 +109,5 @@ EXTRA_DIST=\
 	$(PIXMAP_FILES) \
 	$(serviceentry_DATA) \
 	$(desktopentry_DATA) \
+	$(backupsettings_DATA) \
 	$(icon_26x26_DATA)