* make osso-addressbook (libosso-abook-dev) optional; if it's

[modest] / src / maemo / Makefile.am

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index 54a5500..22ed80b 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -26,14 +26,21 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+SUBDIRS=easysetup
 
 INCLUDES=\
-       $(MODEST_GSTUFF_CFLAGS) \
-       $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
-       -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
-       -I ${top_srcdir}/src/widgets  \
-       -I ${top_srcdir}/src  \
-       -DPREFIX=\"@prefix@\" \
+       $(MODEST_GSTUFF_CFLAGS)             \
+       $(MODEST_WPEDITOR_CFLAGS)           \
+       $(MODEST_PLATFORM_CFLAGS)           \
+       $(MODEST_ABOOK_CFLAGS)              \
+       $(MODEST_HILDON_WIDGETS_CFLAGS)     \
+       $(MODEST_HILDON_HELP_CFLAGS)        \
+       $(MODEST_HILDON_MIME_CFLAGS)        \
+       $(MODEST_HILDON_NOTIFY_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
@@ -43,21 +50,54 @@ 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-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     \
        modest-transport-widget.h     \
-        modest-msg-view-window.c       
+       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 
 
-LDADD = \
+
+libmodest_ui_la_LIBADD = \
        $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
+       $(MODEST_ABOOK_LIBS) \
+       $(MODEST_PLATFORM_LIBS) \
+       $(MODEST_WPEDITOR_LIBS) \
+       $(MODEST_HILDON_WIDGETS_LIBS) \
+       $(MODEST_HILDON_MIME_LIBS) \
+       $(MODEST_HILDON_HELP_LIBS) \
+       $(MODEST_HILDON_NOTIFY_LIBS)\
+       easysetup/libmodest-easysetup.la 
 
 PIXMAP_FILES=\
        pixmaps/*.png 
@@ -65,22 +105,26 @@ PIXMAP_FILES=\
 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)
 
-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
+icon_26x26_DATA     = pixmaps/modest-icon.png
 
 EXTRA_DIST=\
        $(UI_FILES) \
        $(PIXMAP_FILES) \
        $(serviceentry_DATA) \
        $(desktopentry_DATA) \
+       $(backupsettings_DATA) \
        $(icon_26x26_DATA)