* Changes in the autotools stuff affecting a lot of platform dependent

[modest] / src / maemo / Makefile.am

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index 703da40..f4a8a34 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -29,12 +29,20 @@
 SUBDIRS=easysetup
 
 INCLUDES=\
-       $(MODEST_GSTUFF_CFLAGS) \
-       $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
-       -I ${top_srcdir}/src/widgets  \
-       -I ${top_srcdir}/src  \
-       -DPREFIX=\"@prefix@\" \
-       -DMAEMO_CHANGES \
+       $(MODEST_GSTUFF_CFLAGS)             \
+       $(MODEST_WPEDITOR_CFLAGS)           \
+       $(MODEST_PLATFORM_CFLAGS)           \
+       $(MODEST_TOOLKIT_CFLAGS)           \
+       $(MODEST_ABOOK_CFLAGS)              \
+       $(MODEST_HILDON_HELP_CFLAGS)        \
+       $(MODEST_LIBCONIC_CFLAGS)           \
+       $(MODEST_HILDON_MIME_CFLAGS)        \
+       $(MODEST_HILDON_NOTIFY_CFLAGS)      \
+       $(MODEST_LIBALARM_CFLAGS)           \
+       -I ${top_srcdir}/src/widgets        \
+       -I ${top_srcdir}/src                \
+       -DPREFIX=\"@prefix@\"               \
+       -DMAEMO_CHANGES                     \
        -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
        -DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \
        -Wall
@@ -44,43 +52,49 @@ noinst_LTLIBRARIES=\
 
 libmodest_ui_la_SOURCES=              \
        modest-account-view-window.c  \
-       modest-address-book.c         \
+       modest-default-account-settings-dialog.c \
        modest-icon-names.h           \
        modest-maemo-global-settings-dialog.c \
        modest-maemo-global-settings-dialog.h \
-       modest-maemo-ui-constants.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-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     \
-       modest-transport-widget.h     \
        modest-msg-view-window.c      \
        modest-msg-edit-window.c      \
        modest-maemo-utils.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-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   
 
+if MODEST_USE_DUMMY_ADDRESS_BOOK
+#       nothing 
+else
+libmodest_ui_la_SOURCES += modest-address-book.c
+endif 
+
 
 libmodest_ui_la_LIBADD = \
        $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_LIBTINYMAIL_MAEMO_LIBS) \
+       $(MODEST_ABOOK_LIBS) \
+       $(MODEST_PLATFORM_LIBS) \
+       $(MODEST_TOOLKIT_LIBS) \
+       $(MODEST_WPEDITOR_LIBS) \
+       $(MODEST_HILDON_MIME_LIBS) \
+       $(MODEST_LIBCONIC_LIBS) \
+       $(MODEST_HILDON_HELP_LIBS) \
+       $(MODEST_LIBALARM_LIBS)   \
+       $(MODEST_HILDON_NOTIFY_LIBS) \
        easysetup/libmodest-easysetup.la 
 
 PIXMAP_FILES=\
@@ -103,7 +117,7 @@ serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
 
-icon_26x26_DATA    = pixmaps/modest-icon.png
+icon_26x26_DATA     = pixmaps/modest-icon.png
 
 EXTRA_DIST=\
        $(UI_FILES) \