X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2FMakefile.am;h=86ecbff674254fd3b34df9f99708f55cbf110d47;hp=225375d3491c91cbd11287f8a99afd48ed18b26e;hb=409073f3e912ca661ad412cabb6aea1204ab12b1;hpb=0157fe7291bed654b46a5efeff4b9231b6b8a916

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 225375d..86ecbff 100644
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -5,11 +5,12 @@
 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/\" \
@@ -18,8 +19,25 @@ INCLUDES=\
 noinst_LTLIBRARIES=\
 	libmodest-widgets.la
 
+to_remove=\
+	modest-testplugin-easysetup-wizard-page.h \
+	modest-testplugin-account-settings-dialog.h \
+	modest-testplugin-account-settings-widget.h
+
+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	
+
+
 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 +46,21 @@ 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-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-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-hildon1-window-mgr.c \
+	modest-hildon1-window-mgr.h \
 	modest-hbox-cell-renderer.c    \
 	modest-hbox-cell-renderer.h    \
 	modest-vbox-cell-renderer.c    \
@@ -49,8 +74,8 @@ libmodest_widgets_la_SOURCES=          \
 	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        \
@@ -75,16 +100,23 @@ libmodest_widgets_la_SOURCES=          \
 	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-security-options-view.h	\
+	modest-security-options-view.c	\
+	modest-serversecurity-combo-box.h \
+	modest-serversecurity-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-validating-entry.c \
 	modest-window.c                \
-	modest-window.h	               \
 	modest-window-mgr.h            \
 	modest-window-mgr.c            \
+	modest-wizard-dialog.h         \
+	modest-wizard-dialog.c         \
 	modest-zoomable.h              \
 	modest-zoomable.c
 
@@ -96,8 +128,11 @@ libmodest_widgets_la_SOURCES+=          \
 	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)