* 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 eb0283b..22ed80b 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -29,13 +29,18 @@
 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@\" \
-       -DMAEMO_CHANGES \
+       $(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
@@ -45,9 +50,9 @@ noinst_LTLIBRARIES=\
 
 libmodest_ui_la_SOURCES=              \
        modest-account-view-window.c  \
-       modest-address-book.c         \
        modest-icon-names.h           \
-       modest-maemo-ui-constants.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      \
@@ -76,10 +81,22 @@ libmodest_ui_la_SOURCES=              \
        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_WPEDITOR_LIBS) \
+       $(MODEST_HILDON_WIDGETS_LIBS) \
+       $(MODEST_HILDON_MIME_LIBS) \
+       $(MODEST_HILDON_HELP_LIBS) \
+       $(MODEST_HILDON_NOTIFY_LIBS)\
        easysetup/libmodest-easysetup.la 
 
 PIXMAP_FILES=\
@@ -88,6 +105,8 @@ 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 \
@@ -96,14 +115,16 @@ UI_FILES=\
 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)