X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2FMakefile.am;h=15d979bc454250891904f13781e78b9d226922c7;hb=935c84219c0eb59e86a610806d6f9f0e017e4072;hp=0d9c19fa524d7021e8af31c853ab05616555ae62;hpb=fe833425215cedede115b7bb46e79a192e66dcd9;p=modest

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index 0d9c19f..15d979b 100644
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -29,12 +29,17 @@
 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_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
@@ -46,7 +51,8 @@ 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      \
@@ -78,7 +84,12 @@ libmodest_ui_la_SOURCES=              \
 
 libmodest_ui_la_LIBADD = \
 	$(MODEST_GSTUFF_LIBS) \
-	$(MODEST_LIBTINYMAIL_MAEMO_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=\
@@ -87,6 +98,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 \
@@ -95,14 +108,16 @@ UI_FILES=\
 uidir = $(datadir)/modest/ui
 ui_DATA = $(UI_FILES)
 
-serviceentry_DATA = com.nokia.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)