* big commit, mainly cleanups:

[modest] / src / maemo / Makefile.am

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index 54a5500..8c726af 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -29,7 +29,7 @@
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS) \
-       $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
+       $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
        -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
        -I ${top_srcdir}/src/widgets  \
        -I ${top_srcdir}/src  \
@@ -43,21 +43,24 @@ noinst_LTLIBRARIES=\
 
 libmodest_ui_la_SOURCES=              \
        modest-account-view-window.c  \
-       modest-account-view-window.h  \
-       modest-edit-msg-window.c      \
        modest-icon-names.h           \
        modest-main-window.c          \
        modest-main-window-ui.h       \
+       modest-platform.c             \
        modest-store-widget.c         \
        modest-store-widget.h         \
        modest-transport-widget.c     \
        modest-transport-widget.h     \
-        modest-msg-view-window.c       
-
+        modest-msg-view-window.c      \
+       modest-msg-edit-window.c      \
+       modest-account-assistant.c    \
+       modest-account-assistant.h    \
+       modest-maemo-utils.c          \
+       modest-maemo-utils.h
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
+       $(MODEST_LIBTINYMAIL_MAEMO_LIBS)
 
 PIXMAP_FILES=\
        pixmaps/*.png 
@@ -66,10 +69,10 @@ pixmapdir = $(datadir)/pixmaps/modest
 pixmap_DATA = $(PIXMAP_FILES)
 
 UI_FILES=\
-       ui/modest-ui.xml \
-       ui/modest-edit-msg-window-ui.xml \
+       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)