Add a basic contact merging feature to the address book, thanks to
[claws.git] / src / Makefile.am
index b109034c0354b558e14997a3783d82f10c50da43..460c1823dc1999525940c5030df446b1bb3b7801 100644 (file)
@@ -45,6 +45,7 @@ orig_abook_source = \
        addrquery.c \
        addrselect.c \
        addrduplicates.c \
+       addrmerge.c \
        browseldap.c \
        editaddress.c \
        editaddress_other_attributes_ldap.c \
@@ -93,6 +94,7 @@ abook_headers = \
        addrquery.h \
        addrselect.h \
        addrduplicates.h \
+       addrmerge.h \
        browseldap.h \
        editaddress.h \
        editaddress_other_attributes_ldap.h \
@@ -142,6 +144,7 @@ claws_mail_SOURCES = \
        displayheader.c \
        edittags.c \
        enriched.c \
+       entity.c \
        export.c \
         file_checker.c \
        filtering.c \
@@ -260,6 +263,7 @@ claws_mailinclude_HEADERS = \
        displayheader.h \
        edittags.h \
        enriched.h \
+       entity.h \
        export.h \
        filtering.h \
        folder.h \
@@ -372,6 +376,7 @@ CLEANFILES = \
 endif
 
 EXTRA_DIST = \
+       claws-contacts.xml \
        w32-logo.ico w32-resource.rc \
        pixmaps/addr_one.xpm \
        pixmaps/addr_two.xpm \
@@ -391,54 +396,72 @@ EXTRA_DIST = \
        pixmaps/claws_mail_compose_logo.xpm \
        pixmaps/claws_mail_logo.xpm \
        pixmaps/claws_mail_logo_small.xpm \
-       pixmaps/claws-mail.xpm \
        pixmaps/clip.xpm \
        pixmaps/clip_gpg_signed.xpm \
        pixmaps/close.xpm \
        pixmaps/complete.xpm \
        pixmaps/continue.xpm \
+       pixmaps/copied.xpm \
        pixmaps/delete_btn.xpm \
+       pixmaps/delete_dup_btn.xpm \
        pixmaps/deleted.xpm \
        pixmaps/dir_close.xpm \
        pixmaps/dir_close_hrm.xpm \
-       pixmaps/dir_open_hrm.xpm \
+       pixmaps/dir_close_hrm_mark.xpm \
+       pixmaps/dir_close_mark.xpm \
        pixmaps/dir_open.xpm \
+       pixmaps/dir_open_hrm.xpm \
+       pixmaps/dir_open_hrm_mark.xpm \
+       pixmaps/dir_open_mark.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/doc_index.xpm \
+       pixmaps/doc_index_close.xpm \
+       pixmaps/doc_info.xpm \
        pixmaps/down_arrow.xpm \
        pixmaps/drafts_close.xpm \
+       pixmaps/drafts_close_mark.xpm \
        pixmaps/drafts_open.xpm \
-       pixmaps/drafts_close.xpm \
-       pixmaps/drafts_open.xpm \
+       pixmaps/drafts_open_mark.xpm \
        pixmaps/edit_extern.xpm \
+       pixmaps/empty.xpm \
        pixmaps/error.xpm \
        pixmaps/exec.xpm \
+       pixmaps/first_arrow.xpm \
        pixmaps/forwarded.xpm \
        pixmaps/gpg_signed.xpm \
        pixmaps/go_folders.xpm \
        pixmaps/group.xpm \
        pixmaps/ham_btn.xpm \
        pixmaps/ignorethread.xpm \
-       pixmaps/inbox_open_hrm.xpm \
        pixmaps/inbox_open.xpm \
-       pixmaps/inbox_close_hrm.xpm \
+       pixmaps/inbox_open_hrm.xpm \
+       pixmaps/inbox_open_hrm_mark.xpm \
+       pixmaps/inbox_open_mark.xpm \
        pixmaps/inbox_close.xpm \
+       pixmaps/inbox_close_hrm.xpm \
+       pixmaps/inbox_close_hrm_mark.xpm \
+       pixmaps/inbox_close_mark.xpm \
        pixmaps/interface.xpm \
        pixmaps/insert_file.xpm \
        pixmaps/jpilot.xpm \
        pixmaps/key.xpm \
        pixmaps/key_gpg_signed.xpm \
+       pixmaps/last_arrow.xpm \
        pixmaps/ldap.xpm \
+       pixmaps/left_arrow.xpm \
        pixmaps/linewrap.xpm \
        pixmaps/linewrapcurrent.xpm \
        pixmaps/locked.xpm \
        pixmaps/mail_attach.xpm \
        pixmaps/mail_compose.xpm \
        pixmaps/mail_forward.xpm \
+       pixmaps/mail_privacy_encrypted.xpm \
+       pixmaps/mail_privacy_signed.xpm \
        pixmaps/mail_receive_all.xpm \
        pixmaps/mail_receive.xpm \
        pixmaps/mail_reply_to_all.xpm \
@@ -448,8 +471,18 @@ EXTRA_DIST = \
        pixmaps/mail_send_queue.xpm \
        pixmaps/mail_send.xpm \
        pixmaps/mail_sign.xpm \
-       pixmaps/mail.xpm \
+       pixmaps/mail_draft.xpm \
        pixmaps/mark.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/mime_application.xpm \
        pixmaps/mime_audio.xpm \
        pixmaps/mime_image.xpm \
@@ -463,6 +496,7 @@ EXTRA_DIST = \
        pixmaps/mime_text_patch.xpm \
        pixmaps/mime_text_plain.xpm \
        pixmaps/mime_unknown.xpm \
+       pixmaps/moved.xpm \
        pixmaps/news_compose.xpm \
        pixmaps/new.xpm \
        pixmaps/notice_error.xpm \
@@ -482,6 +516,7 @@ EXTRA_DIST = \
        pixmaps/paste.xpm \
        pixmaps/preferences.xpm \
        pixmaps/printer.xpm \
+       pixmaps/printer_btn.xpm \
        pixmaps/privacy_expired.xpm \
        pixmaps/privacy_failed.xpm \
        pixmaps/privacy_passed.xpm \
@@ -504,32 +539,22 @@ EXTRA_DIST = \
        pixmaps/queue_open_mark.xpm \
        pixmaps/quicksearch.xpm \
        pixmaps/replied.xpm \
-       pixmaps/search.xpm \
+       pixmaps/replied_and_forwarded.xpm \
+       pixmaps/right_arrow.xpm \
+       pixmaps/rotate_left.xpm \
+       pixmaps/rotate_right.xpm \
        pixmaps/selection.xpm \
        pixmaps/spam.xpm \
        pixmaps/spam_btn.xpm \
-       pixmaps/trash_hrm.xpm \
-       pixmaps/trash.xpm \
        pixmaps/trash_btn.xpm \
-       pixmaps/unread.xpm \
-       pixmaps/read.xpm \
-       pixmaps/up_arrow.xpm \
-       pixmaps/vcard.xpm \
-       pixmaps/dir_close_mark.xpm \
-       pixmaps/dir_close_hrm_mark.xpm \
-       pixmaps/dir_open_hrm_mark.xpm \
-       pixmaps/dir_open_mark.xpm \
-       pixmaps/drafts_close_mark.xpm \
-       pixmaps/drafts_open_mark.xpm \
-       pixmaps/inbox_open_hrm_mark.xpm \
-       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/moved.xpm \
-       pixmaps/copied.xpm \
-       pixmaps/watchthread.xpm \
+       pixmaps/trash_close.xpm \
+       pixmaps/trash_close_hrm.xpm \
+       pixmaps/trash_close_hrm_mark.xpm \
+       pixmaps/trash_close_mark.xpm \
+       pixmaps/trash_open.xpm \
+       pixmaps/trash_open_hrm.xpm \
+       pixmaps/trash_open_hrm_mark.xpm \
+       pixmaps/trash_open_mark.xpm \
        pixmaps/tray_newmail_offline.xpm \
        pixmaps/tray_newmail.xpm \
        pixmaps/tray_newmarkedmail_offline.xpm \
@@ -540,9 +565,15 @@ EXTRA_DIST = \
        pixmaps/tray_unreadmail.xpm \
        pixmaps/tray_unreadmarkedmail_offline.xpm \
        pixmaps/tray_unreadmarkedmail.xpm \
-       pixmaps/empty.xpm \
-       pixmaps/replied_and_forwarded.xpm \
-       claws-contacts.xml \
+       pixmaps/unread.xpm \
+       pixmaps/read.xpm \
+       pixmaps/up_arrow.xpm \
+       pixmaps/vcard.xpm \
+       pixmaps/watchthread.xpm \
+       pixmaps/zoom_fit.xpm \
+       pixmaps/zoom_in.xpm \
+       pixmaps/zoom_out.xpm \
+       pixmaps/zoom_width.xpm \
        $(abook_extra)
 
 
@@ -575,6 +606,7 @@ claws_mail_LDADD = \
        $(STARTUP_NOTIFICATION_LIBS) \
        $(LIBETPAN_LIBS) \
        $(DBUS_LIBS) \
+       $(SVG_LIBS) \
        $(CONTACTS_LIBS)
 
 pixmapdir=$(datadir)/icons/hicolor/48x48/apps
@@ -595,6 +627,7 @@ AM_CPPFLAGS = \
        $(LIBETPAN_CPPFLAGS) \
        $(STARTUP_NOTIFICATION_CFLAGS) \
        $(DBUS_CFLAGS) \
+       $(SVG_CFLAGS) \
        $(NETWORKMANAGER_SUPPORT_CFLAGS) \
        $(VALGRIND_CFLAGS) \
        $(CONTACTS_CFLAGS)