X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2FMakefile.am;h=4aa30dbe08b3e3429c45b235f5f31fbae5a8ec48;hp=3975a2125867895ba4ff865d5c0f4cbe26ea8f92;hb=ec98b6e930e0b781d77b277db25bbf638083c9cf;hpb=dbbefa965fe138f1ec092c128c5a49259573abf4

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 3975a21..4aa30db 100644
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -5,21 +5,38 @@
 INCLUDES=\
 	$(MODEST_GSTUFF_CFLAGS) \
 	$(MODEST_PLATFORM_CFLAGS) \
-	$(MODEST_HILDON_WIDGETS_CFLAGS) \
+	$(MODEST_TOOLKIT_CFLAGS) \
+	$(MODEST_PLUGIN_DEFINES) \
 	$(MODEST_HILDON_HELP_CFLAGS)    \
 	$(MODEST_MOZEMBED_CFLAGS) \
 	$(MODEST_HILDON_NOTIFY_CFLAGS) \
-	-I ${top_srcdir}/src/$(MODEST_PLATFORM) \
+	-I ${top_srcdir}/src/$(MODEST_TOOLKIT_DIR) \
 	-I ${top_srcdir}/src \
 	-DPREFIX=\"@prefix@\" \
 	-DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
+	-DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \
 	-Wall
 
 noinst_LTLIBRARIES=\
 	libmodest-widgets.la
 
+
+libmodest_widgets_public_headers = \
+	modest-account-settings-dialog.h \
+	modest-easysetup-wizard-page.h \
+	modest-folder-view.h           \
+	modest-sort-criterium-view.h  \
+	modest-ui-constants.h \
+	modest-validating-entry.h \
+	modest-window.h	\
+	modest-window-mgr.h	\
+	modest-wizard-dialog.h
+
+
 libmodest_widgets_la_SOURCES=          \
+	$(libmodest_widgets_public_headers) \
 	modest-account-view-window.h   \
+	modest-account-settings-dialog.c \
 	modest-account-view.c          \
 	modest-account-view.h          \
 	modest-attachment-view.c       \
@@ -28,14 +45,26 @@ libmodest_widgets_la_SOURCES=          \
 	modest-attachments-view.h      \
 	modest-combo-box.c	       \
 	modest-combo-box.h             \
+	modest-compact-mail-header-view.c \
+	modest-compact-mail-header-view.h \
+	modest-connection-specific-smtp-window.h \
+	modest-country-combo-box.c \
+	modest-country-combo-box.h \
+	modest-default-account-settings-dialog.h \
 	modest-dnd.c                   \
 	modest-dnd.h                   \
+	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           \
-	modest-folder-view.h           \
 	modest-global-settings-dialog.c \
 	modest-global-settings-dialog.h \
 	modest-gtkhtml-mime-part-view.c \
 	modest-gtkhtml-mime-part-view.h \
+	modest-gtk-security-options-view.c \
+	modest-gtk-security-options-view.h \
 	modest-hbox-cell-renderer.c    \
 	modest-hbox-cell-renderer.h    \
 	modest-vbox-cell-renderer.c    \
@@ -45,57 +74,75 @@ libmodest_widgets_la_SOURCES=          \
 	modest-header-view-render.c    \
 	modest-header-view.c           \
 	modest-header-view.h           \
+	modest-isearch-toolbar.c       \
+	modest-isearch-toolbar.h       \
 	modest-isearch-view.c          \
 	modest-isearch-view.h          \
 	modest-limit-retrieve-combo-box.h \
 	modest-limit-retrieve-combo-box.c \
-	modest-mail-header-view.c      \
-	modest-mail-header-view.h      \
+	modest-mail-header-view.h \
+	modest-mail-header-view.c \
 	modest-main-window.h	       \
 	modest-mime-part-view.c        \
 	modest-mime-part-view.h        \
 	modest-msg-edit-window-ui.h    \
 	modest-msg-edit-window.h       \
 	modest-msg-view-window.h       \
+	modest-msg-view-window.c       \
 	modest-msg-view.c              \
 	modest-msg-view.h	       \
 	modest-gtkhtml-msg-view.c              \
 	modest-gtkhtml-msg-view.h	       \
 	modest-details-dialog.c        \
 	modest-details-dialog.h        \
+	modest-progress-bar.c	\
+	modest-progress-bar.h	\
+	modest-provider-combo-box.c    \
+	modest-provider-combo-box.h    \
 	modest-recpt-editor.c          \
 	modest-recpt-editor.h          \
 	modest-recpt-view.c            \
 	modest-recpt-view.h            \
 	modest-retrieve-combo-box.h    \
 	modest-retrieve-combo-box.c    \
+	modest-scrollable.h           \
+	modest-scrollable.c           \
 	modest-scroll-area.h          \
 	modest-scroll-area.c          \
 	modest-scroll-text.c           \
 	modest-scroll-text.h           \
-	modest-serversecurity-combo-box.h modest-serversecurity-combo-box.c \
-	modest-secureauth-combo-box.h modest-secureauth-combo-box.c \
+	modest-scrolled-window-scrollable.c \
+	modest-scrolled-window-scrollable.h \
+	modest-security-options-view.h	\
+	modest-security-options-view.c	\
+	modest-serversecurity-combo-box.h \
+	modest-serversecurity-combo-box.c \
+	modest-servertype-combo-box.h \
+	modest-servertype-combo-box.c \
+	modest-secureauth-combo-box.h \
+	modest-secureauth-combo-box.c \
+	modest-sort-criterium-view.c   \
+	modest-sort-criterium-view.c   \
+	modest-sort-criterium-view.h   \
 	modest-tny-stream-gtkhtml.c    \
 	modest-tny-stream-gtkhtml.h    \
-	modest-ui-constants.h \
-	modest-validating-entry.h modest-validating-entry.c \
+	modest-toolkit-factory.c \
+	modest-toolkit-factory.h \
+	modest-validating-entry.c \
 	modest-window.c                \
-	modest-window.h	               \
+	modest-window-mgr-priv.h	\
 	modest-window-mgr.h            \
 	modest-window-mgr.c            \
+	modest-wizard-dialog.h         \
+	modest-wizard-dialog.c         \
 	modest-zoomable.h              \
 	modest-zoomable.c
 
-if BUILD_MOZEMBED
-libmodest_widgets_la_SOURCES+=          \
-	modest-mozembed-msg-view.c              \
-	modest-mozembed-msg-view.h	       \
-	modest-mozembed-mime-part-view.c \
-	modest-mozembed-mime-part-view.h 	
-endif
+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_PLATFORM_LIBS)				\
-	$(MODEST_HILDON_WIDGETS_LIBS) 
+	$(MODEST_TOOLKIT_LIBS)