Fix wrong call to missing *_unread func (we use the *_read() func

[claws.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f958fd5a5c9249400fe64090c08a45f1f1126c89..6aee1cc6b3570035d5c6d7811a52e812ea8c871d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -178,6 +178,7 @@ claws_mail_SOURCES = \
        partial_download.c \
        password.c \
        password_gtk.c \
+       passwordstore.c \
        pop.c \
        prefs_account.c \
        prefs_actions.c \
@@ -195,6 +196,7 @@ claws_mail_SOURCES = \
        prefs_logging.c \
        prefs_matcher.c \
        prefs_message.c \
+       prefs_migration.c \
        prefs_msg_colors.c \
        prefs_other.c \
        prefs_quote.c \
@@ -295,6 +297,7 @@ claws_mailinclude_HEADERS = \
        partial_download.h \
        password.h \
        password_gtk.h \
+       passwordstore.h \
        pop.h \
        prefs_account.h \
        prefs_actions.h \
@@ -312,6 +315,7 @@ claws_mailinclude_HEADERS = \
        prefs_logging.h \
        prefs_matcher.h \
        prefs_message.h \
+       prefs_migration.h \
        prefs_msg_colors.h \
        prefs_other.h \
        prefs_quote.h \
@@ -382,11 +386,11 @@ EXTRA_DIST = \
        pixmaps/checkbox_on.xpm \
        pixmaps/check_spelling.xpm \
        pixmaps/clipkey.xpm \
-       pixmaps/claws-mail_icon.xpm \
-       pixmaps/claws-mail_compose_logo.xpm \
-       pixmaps/claws-mail_logo.xpm \
-       pixmaps/claws-mail_logo-small.xpm \
-       pixmaps/claws-mail.xpm \
+       pixmaps/claws_mail_icon.xpm \
+       pixmaps/claws_mail_icon_64.xpm \
+       pixmaps/claws_mail_compose_logo.xpm \
+       pixmaps/claws_mail_logo.xpm \
+       pixmaps/claws_mail_logo_small.xpm \
        pixmaps/clip.xpm \
        pixmaps/clip_gpg_signed.xpm \
        pixmaps/close.xpm \
@@ -396,9 +400,14 @@ EXTRA_DIST = \
        pixmaps/deleted.xpm \
        pixmaps/dir_close.xpm \
        pixmaps/dir_close_hrm.xpm \
-       pixmaps/dir_noselect.xpm \
        pixmaps/dir_open_hrm.xpm \
        pixmaps/dir_open.xpm \
+       pixmaps/dir_noselect_close.xpm \
+       pixmaps/dir_noselect_close_mark.xpm \
+       pixmaps/dir_noselect_open.xpm \
+       pixmaps/dir_subs_close_mark.xpm \
+       pixmaps/dir_subs_close.xpm \
+       pixmaps/dir_subs_open.xpm \
        pixmaps/down_arrow.xpm \
        pixmaps/drafts_close.xpm \
        pixmaps/drafts_open.xpm \
@@ -494,12 +503,13 @@ EXTRA_DIST = \
        pixmaps/queue_open_mark.xpm \
        pixmaps/quicksearch.xpm \
        pixmaps/replied.xpm \
-       pixmaps/search.xpm \
        pixmaps/selection.xpm \
        pixmaps/spam.xpm \
        pixmaps/spam_btn.xpm \
-       pixmaps/trash_hrm.xpm \
-       pixmaps/trash.xpm \
+       pixmaps/trash_open_hrm.xpm \
+       pixmaps/trash_close_hrm.xpm \
+       pixmaps/trash_open.xpm \
+       pixmaps/trash_close.xpm \
        pixmaps/trash_btn.xpm \
        pixmaps/unread.xpm \
        pixmaps/read.xpm \
@@ -515,23 +525,49 @@ EXTRA_DIST = \
        pixmaps/inbox_open_mark.xpm \
        pixmaps/inbox_close_hrm_mark.xpm \
        pixmaps/inbox_close_mark.xpm \
-       pixmaps/trash_hrm_mark.xpm \
-       pixmaps/trash_mark.xpm \
+       pixmaps/trash_open_hrm_mark.xpm \
+       pixmaps/trash_close_hrm_mark.xpm \
+       pixmaps/trash_open_mark.xpm \
+       pixmaps/trash_close_mark.xpm \
        pixmaps/moved.xpm \
        pixmaps/copied.xpm \
        pixmaps/watchthread.xpm \
-       pixmaps/tray_newmail.offline.xpm \
+       pixmaps/tray_newmail_offline.xpm \
        pixmaps/tray_newmail.xpm \
-       pixmaps/tray_newmarkedmail.offline.xpm \
+       pixmaps/tray_newmarkedmail_offline.xpm \
        pixmaps/tray_newmarkedmail.xpm \
-       pixmaps/tray_nomail.offline.xpm \
+       pixmaps/tray_nomail_offline.xpm \
        pixmaps/tray_nomail.xpm \
-       pixmaps/tray_unreadmail.offline.xpm \
+       pixmaps/tray_unreadmail_offline.xpm \
        pixmaps/tray_unreadmail.xpm \
-       pixmaps/tray_unreadmarkedmail.offline.xpm \
+       pixmaps/tray_unreadmarkedmail_offline.xpm \
        pixmaps/tray_unreadmarkedmail.xpm \
        pixmaps/empty.xpm \
        pixmaps/replied_and_forwarded.xpm \
+       pixmaps/doc_index.xpm \
+       pixmaps/doc_index_close.xpm \
+       pixmaps/doc_info.xpm \
+       pixmaps/first_arrow.xpm \
+       pixmaps/last_arrow.xpm \
+       pixmaps/left_arrow.xpm \
+       pixmaps/right_arrow.xpm \
+       pixmaps/rotate_left.xpm \
+       pixmaps/rotate_right.xpm \
+       pixmaps/zoom_fit.xpm \
+       pixmaps/zoom_in.xpm \
+       pixmaps/zoom_out.xpm \
+       pixmaps/zoom_width.xpm \
+       pixmaps/mark_allread.xpm \
+       pixmaps/mark_allunread.xpm \
+       pixmaps/mark_ignorethread.xpm \
+       pixmaps/mark_locked.xpm \
+       pixmaps/mark_mark.xpm \
+       pixmaps/mark_read.xpm \
+       pixmaps/mark_unlocked.xpm \
+       pixmaps/mark_unmark.xpm \
+       pixmaps/mark_unread.xpm \
+       pixmaps/mark_watchthread.xpm \
+       pixmaps/mark.xpm \
        claws-contacts.xml \
        $(abook_extra)
 
@@ -542,14 +578,8 @@ IFLAGS = \
        -I$(srcdir)/gtk \
        -I$(srcdir)/etpan
 
-if PLATFORM_WIN32
-arch_ldflags := -Wl,--export-all-symbols
-else
-arch_ldflags := -Wl,--export-dynamic
-endif
-
 claws_mail_LDFLAGS = \
-       $(arch_ldflags) $(claws_mail_res_ldflag)
+       $(claws_mail_res_ldflag)
 
 claws_mail_DEPENDENCIES = $(claws_mail_deps) \
        $(etpan_library) \
@@ -586,6 +616,7 @@ AM_CPPFLAGS = \
        $(IFLAGS) \
        $(ENCHANT_CFLAGS) \
        $(GTK_CFLAGS) \
+       $(GNUTLS_CFLAGS) \
        $(GPGME_CFLAGS) \
        $(LIBETPAN_CPPFLAGS) \
        $(STARTUP_NOTIFICATION_CFLAGS) \