X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2FMakefile.am;h=e297c00104f30eab26d92ba9ccb6befa0e036fff;hp=59604854baa5842e4f056ff88149de8ad047aa62;hb=f01b90c66d8e39e31efdd85cc401934ada17bade;hpb=a317330da3f666b8dadf8333b69e0d201a12c12b

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 5960485..e297c00 100644
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -8,10 +8,12 @@ INCLUDES=\
 	$(MODEST_TOOLKIT_CFLAGS) \
 	$(MODEST_PLUGIN_DEFINES) \
 	$(MODEST_HILDON_HELP_CFLAGS)    \
+	$(MODEST_WEBKIT_CFLAGS) \
 	$(MODEST_MOZEMBED_CFLAGS) \
 	$(MODEST_WPEDITOR_CFLAGS)           \
 	$(MODEST_LIBCONIC_CFLAGS)	    \
 	$(MODEST_HILDON_NOTIFY_CFLAGS) \
+	$(MODEST_CALENDAR_WIDGETS_CFLAGS)   \
 	-I ${top_srcdir}/src/$(MODEST_TOOLKIT_DIR) \
 	-I ${top_srcdir}/src \
 	-DPREFIX=\"@prefix@\" \
@@ -60,12 +62,12 @@ libmodest_widgets_la_SOURCES=          \
 	modest-country-combo-box.h \
 	modest-default-account-settings-dialog.h \
 	modest-default-account-settings-dialog.c \
+	modest-default-global-settings-dialog.h \
+	modest-default-global-settings-dialog.c \
 	modest-dnd.c                   \
 	modest-dnd.h                   \
 	modest-easysetup-wizard-dialog.h modest-easysetup-wizard-dialog.c \
 	modest-easysetup-wizard-page.c \
-	modest-expander-mail-header-view.c      \
-	modest-expander-mail-header-view.h      \
 	modest-find-toolbar.c          \
 	modest-find-toolbar.h          \
 	modest-folder-view.c           \
@@ -163,13 +165,38 @@ libmodest_widgets_la_SOURCES=          \
 	modest-zoomable.h              \
 	modest-zoomable.c
 
+
 libmodest_widgets_la_includedir = $(includedir)/modest-plugin-1.0/widgets/
 libmodest_widgets_la_include_HEADERS = $(libmodest_widgets_public_headers)
 
 LDADD = \
-	$(MODEST_GSTUFF_LIBS) 				\
-	$(MODEST_MOZEMBED_LIBS)                         \
-	$(MODEST_WPEDITOR_LIBS) \
-	$(MODEST_PLATFORM_LIBS)				\
-	$(MODEST_LIBCONIC_LIBS) \
-	$(MODEST_TOOLKIT_LIBS) 
+	$(MODEST_GSTUFF_LIBS)		\
+	$(MODEST_MOZEMBED_LIBS)         \
+	$(MODEST_WEBKIT_LIBS)           \
+	$(MODEST_WPEDITOR_LIBS) 	\
+	$(MODEST_PLATFORM_LIBS)		\
+	$(MODEST_LIBCONIC_LIBS) 	\
+	$(MODEST_TOOLKIT_LIBS) 		\
+	$(MODEST_CALENDAR_WIDGETS_LIBS)
+
+if MODEST_USE_WEBKIT
+libmodest_widgets_la_SOURCES +=          \
+	modest-webkit-mime-part-view.c   \
+	modest-webkit-mime-part-view.h   \
+	modest-webkit-msg-view.c         \
+	modest-webkit-msg-view.h         \
+	modest-tny-stream-webkit.c       \
+	modest-tny-stream-webkit.h
+
+endif
+
+UI_FILES=\
+	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)
+
+EXTRA_DIST=\
+	$(UI_FILES)