* Changes in the autotools stuff affecting a lot of platform dependent

[modest] / src / widgets / Makefile.am

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 3975a21..ccdef8f 100644 (file)
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -5,7 +5,7 @@
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS) \
        $(MODEST_PLATFORM_CFLAGS) \
-       $(MODEST_HILDON_WIDGETS_CFLAGS) \
+       $(MODEST_TOOLKIT_CFLAGS) \
        $(MODEST_HILDON_HELP_CFLAGS)    \
        $(MODEST_MOZEMBED_CFLAGS) \
        $(MODEST_HILDON_NOTIFY_CFLAGS) \
@@ -18,8 +18,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,10 +45,11 @@ libmodest_widgets_la_SOURCES=          \
        modest-attachments-view.h      \
        modest-combo-box.c             \
        modest-combo-box.h             \
+       modest-default-account-settings-dialog.h \
        modest-dnd.c                   \
        modest-dnd.h                   \
+       modest-easysetup-wizard-page.c \
        modest-folder-view.c           \
-       modest-folder-view.h           \
        modest-global-settings-dialog.c \
        modest-global-settings-dialog.h \
        modest-gtkhtml-mime-part-view.c \
@@ -63,6 +81,8 @@ libmodest_widgets_la_SOURCES=          \
        modest-gtkhtml-msg-view.h              \
        modest-details-dialog.c        \
        modest-details-dialog.h        \
+       modest-progress-bar.c   \
+       modest-progress-bar.h   \
        modest-recpt-editor.c          \
        modest-recpt-editor.h          \
        modest-recpt-view.c            \
@@ -73,16 +93,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
 
@@ -90,12 +117,15 @@ 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.cpp \
        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)