[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-404-gfdbb06fa7

jonathan at claws-mail.org jonathan at claws-mail.org
Mon Jan 24 03:13:01 CET 2022 

The branch, gtk3 has been updated
       via  fdbb06fa7463e60e35bbfe9bee9216ab2ccf4cce (commit)
      from  ddbb7286e39cdb6fb2ea61606520862840d00cf2 (commit)

Summary of changes:
 src/Makefile.am                         |   7 +-
 src/plugins/address_keeper/Makefile.am  |  33 +-----
 src/plugins/address_keeper/claws.def    |  41 --------
 src/plugins/address_keeper/plugin.def   |  10 --
 src/plugins/att_remover/Makefile.am     |  33 +-----
 src/plugins/att_remover/claws.def       |  63 ------------
 src/plugins/att_remover/plugin.def      |  10 --
 src/plugins/attachwarner/Makefile.am    |  33 +-----
 src/plugins/attachwarner/claws.def      |  31 ------
 src/plugins/attachwarner/plugin.def     |  10 --
 src/plugins/bsfilter/Makefile.am        |  33 +-----
 src/plugins/bsfilter/claws.def          |  56 ----------
 src/plugins/bsfilter/plugin.def         |  10 --
 src/plugins/fancy/Makefile.am           |  33 +-----
 src/plugins/fancy/claws.def             |  99 ------------------
 src/plugins/fancy/plugin.def            |  10 --
 src/plugins/fetchinfo/Makefile.am       |  33 +-----
 src/plugins/fetchinfo/claws.def         |  32 ------
 src/plugins/fetchinfo/plugin.def        |  10 --
 src/plugins/libravatar/Makefile.am      |  33 +-----
 src/plugins/libravatar/claws.def        |  46 ---------
 src/plugins/libravatar/plugin.def       |  10 --
 src/plugins/litehtml_viewer/Makefile.am |  29 +-----
 src/plugins/litehtml_viewer/claws.def   |  29 ------
 src/plugins/litehtml_viewer/plugin.def  |  10 --
 src/plugins/mailmbox/Makefile.am        |  33 +-----
 src/plugins/mailmbox/claws.def          |  34 ------
 src/plugins/mailmbox/plugin.def         |  10 --
 src/plugins/managesieve/Makefile.am     |  33 +-----
 src/plugins/managesieve/claws.def       |  76 --------------
 src/plugins/managesieve/plugin.def      |  10 --
 src/plugins/notification/Makefile.am    |  34 +-----
 src/plugins/notification/claws.def      |  75 --------------
 src/plugins/notification/plugin.def     |  10 --
 src/plugins/pdf_viewer/Makefile.am      |  33 +-----
 src/plugins/pdf_viewer/claws.def        |  37 -------
 src/plugins/pdf_viewer/plugin.def       |  10 --
 src/plugins/pgpcore/Makefile.am         |  35 +------
 src/plugins/pgpcore/claws.def           |  81 ---------------
 src/plugins/pgpcore/plugin.def          |  31 ------
 src/plugins/pgpinline/Makefile.am       |  38 +------
 src/plugins/pgpinline/claws.def         |  32 ------
 src/plugins/pgpinline/mypgpcore.def     |  18 ----
 src/plugins/pgpinline/plugin.def        |  10 --
 src/plugins/pgpmime/Makefile.am         |  39 +------
 src/plugins/pgpmime/claws.def           |  26 -----
 src/plugins/pgpmime/mypgpcore.def       |  21 ----
 src/plugins/pgpmime/plugin.def          |   9 --
 src/plugins/rssyl/Makefile.am           |  35 +------
 src/plugins/rssyl/claws.def             | 130 -----------------------
 src/plugins/rssyl/plugin.def            |  10 --
 src/plugins/smime/Makefile.am           |  38 +------
 src/plugins/smime/claws.def             |  37 -------
 src/plugins/smime/mypgpcore.def         |  20 ----
 src/plugins/smime/plugin.def            |  10 --
 src/plugins/spam_report/Makefile.am     |  33 +-----
 src/plugins/spam_report/claws.def       |  56 ----------
 src/plugins/spam_report/plugin.def      |   9 --
 src/plugins/tnef_parse/Makefile.am      |  33 +-----
 src/plugins/tnef_parse/claws.def        |  21 ----
 src/plugins/tnef_parse/plugin.def       |  10 --
 src/plugins/vcalendar/Makefile.am       |  33 +-----
 src/plugins/vcalendar/claws.def         | 177 --------------------------------
 src/plugins/vcalendar/plugin.def        |  10 --
 src/plugins/win_pgpcore.mk              |  15 +++
 src/plugins/win_plugin.mk               |  27 +++++
 66 files changed, 100 insertions(+), 2083 deletions(-)
 delete mode 100644 src/plugins/address_keeper/claws.def
 delete mode 100644 src/plugins/address_keeper/plugin.def
 delete mode 100644 src/plugins/att_remover/claws.def
 delete mode 100644 src/plugins/att_remover/plugin.def
 delete mode 100644 src/plugins/attachwarner/claws.def
 delete mode 100644 src/plugins/attachwarner/plugin.def
 delete mode 100644 src/plugins/bsfilter/claws.def
 delete mode 100644 src/plugins/bsfilter/plugin.def
 delete mode 100644 src/plugins/fancy/claws.def
 delete mode 100644 src/plugins/fancy/plugin.def
 delete mode 100644 src/plugins/fetchinfo/claws.def
 delete mode 100644 src/plugins/fetchinfo/plugin.def
 delete mode 100644 src/plugins/libravatar/claws.def
 delete mode 100644 src/plugins/libravatar/plugin.def
 delete mode 100644 src/plugins/litehtml_viewer/claws.def
 delete mode 100644 src/plugins/litehtml_viewer/plugin.def
 delete mode 100644 src/plugins/mailmbox/claws.def
 delete mode 100644 src/plugins/mailmbox/plugin.def
 delete mode 100644 src/plugins/managesieve/claws.def
 delete mode 100644 src/plugins/managesieve/plugin.def
 delete mode 100644 src/plugins/notification/claws.def
 delete mode 100644 src/plugins/notification/plugin.def
 delete mode 100644 src/plugins/pdf_viewer/claws.def
 delete mode 100644 src/plugins/pdf_viewer/plugin.def
 delete mode 100644 src/plugins/pgpcore/claws.def
 delete mode 100644 src/plugins/pgpcore/plugin.def
 delete mode 100644 src/plugins/pgpinline/claws.def
 delete mode 100644 src/plugins/pgpinline/mypgpcore.def
 delete mode 100644 src/plugins/pgpinline/plugin.def
 delete mode 100644 src/plugins/pgpmime/claws.def
 delete mode 100644 src/plugins/pgpmime/mypgpcore.def
 delete mode 100644 src/plugins/pgpmime/plugin.def
 delete mode 100644 src/plugins/rssyl/claws.def
 delete mode 100644 src/plugins/rssyl/plugin.def
 delete mode 100644 src/plugins/smime/claws.def
 delete mode 100644 src/plugins/smime/mypgpcore.def
 delete mode 100644 src/plugins/smime/plugin.def
 delete mode 100644 src/plugins/spam_report/claws.def
 delete mode 100644 src/plugins/spam_report/plugin.def
 delete mode 100644 src/plugins/tnef_parse/claws.def
 delete mode 100644 src/plugins/tnef_parse/plugin.def
 delete mode 100644 src/plugins/vcalendar/claws.def
 delete mode 100644 src/plugins/vcalendar/plugin.def
 create mode 100644 src/plugins/win_pgpcore.mk
 create mode 100644 src/plugins/win_plugin.mk


- Log -----------------------------------------------------------------
commit fdbb06fa7463e60e35bbfe9bee9216ab2ccf4cce
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Mon Jan 17 17:02:01 2022 -0700

    Clean up plugin build files for Windows
    
    Drop explicit .def files and rely on linker auto-import/export
    Move boilerplate to common automake include fragments

diff --git a/src/Makefile.am b/src/Makefile.am
index 3b100ec64..565d1e7ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,10 +23,11 @@ if PLATFORM_WIN32
 %.o : %.rc
 	$(LIBTOOL) --mode=compile --tag=RC $(RC) -I$(srcdir) -i $< -o $@
 
-claws_mail_res_ldflag = -Wl,w32-resource.o
+claws_mail_platform_ldflags = -Wl,w32-resource.o \
+	-Wl,--export-all-symbols,--out-implib=libclaws.a
 claws_mail_deps = w32-resource.o
 else
-claws_mail_res_ldflag =
+claws_mail_platform_ldflags =
 claws_mail_deps =
 endif
 
@@ -581,7 +582,7 @@ IFLAGS = \
 	-I$(srcdir)/etpan
 
 claws_mail_LDFLAGS = \
-	$(claws_mail_res_ldflag)
+	$(claws_mail_platform_ldflags)
 
 claws_mail_DEPENDENCIES = $(claws_mail_deps) \
 	$(etpan_library) \
diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index 1ec3d05a5..a2c72840a 100644
--- a/src/plugins/address_keeper/Makefile.am
+++ b/src/plugins/address_keeper/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,32 +12,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_ADDRESS_KEEPER_PLUGIN
@@ -65,7 +39,4 @@ address_keeper_la_SOURCES = \
 	address_keeper_prefs.c \
 	address_keeper_prefs.h
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/address_keeper/claws.def b/src/plugins/address_keeper/claws.def
deleted file mode 100644
index 14daf073c..000000000
--- a/src/plugins/address_keeper/claws.def
+++ /dev/null
@@ -1,41 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-get_locale_dir
-check_plugin_version
-alertpanel
-conv_codeset_strdup
-conv_get_locale_charset_str_no_utf8
-debug_print_real
-debug_srcname
-get_rc_dir 
-hooks_register_hook
-hooks_unregister_hook
-line_has_quote_char
-matcherlist_free
-matcherlist_match
-matcherlist_new
-matcherprop_new
-pref_get_escaped_pref
-pref_get_unescaped_pref
-prefs_common
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-prefs_common_get_prefs
-extract_address
-start_address_completion
-complete_matches_found
-addrbook_add_contact
-addressbook_refresh
-end_address_completion
-addressbook_peek_folder_exists
-prefs_common_translated_header_name
-addressbook_folder_selection
-matcherlist_new_from_lines
-gtkut_get_options_frame
diff --git a/src/plugins/address_keeper/plugin.def b/src/plugins/address_keeper/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/address_keeper/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index 424a4fa4e..f9e51904b 100644
--- a/src/plugins/att_remover/Makefile.am
+++ b/src/plugins/att_remover/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,32 +12,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_ATT_REMOVER_PLUGIN
@@ -62,7 +36,4 @@ att_remover_la_CPPFLAGS = \
 att_remover_la_SOURCES = \
 	att_remover.c
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/att_remover/claws.def b/src/plugins/att_remover/claws.def
deleted file mode 100644
index 0a2ed42b1..000000000
--- a/src/plugins/att_remover/claws.def
+++ /dev/null
@@ -1,63 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-alertpanel
-alertpanel_full
-alertpanel_notice
-check_plugin_version
-conv_codeset_strdup
-conv_get_locale_charset_str_no_utf8
-debug_print_real
-debug_srcname
-folder_item_add_msg
-folder_item_get_msginfo
-folder_item_remove_msg
-folder_item_update_freeze
-folder_item_update_thaw
-get_locale_dir
-get_rc_dir 
-gtk_cmclist_freeze
-gtk_cmclist_get_type
-gtk_cmclist_thaw
-gtkut_stock_button_set_create
-gtkut_window_new
-hooks_register_hook
-hooks_unregister_hook
-inc_lock_count
-inc_lock_real
-inc_unlock_real
-line_has_quote_char
-main_window_cursor_normal
-main_window_cursor_wait
-mainwindow_get_mainwindow
-matcherlist_free
-matcherlist_match
-matcherlist_new
-matcherprop_new
-pref_get_escaped_pref
-pref_get_unescaped_pref
-prefs_common_get_prefs
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-procmime_get_content_type_str
-procmime_mimeinfo_get_parameter
-procmime_mimeinfo_next
-procmime_mimeinfo_parent
-procmime_scan_message
-procmsg_msginfo_copy
-procmsg_msginfo_free
-procmsg_msginfo_new_from_mimeinfo
-procmsg_msginfo_set_flags
-procmsg_msginfo_unset_flags
-summary_get_selected_msg_list
-summary_freeze
-summary_is_locked
-summary_select_by_msgnum
-summary_thaw
-to_human_readable
diff --git a/src/plugins/att_remover/plugin.def b/src/plugins/att_remover/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/att_remover/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am
index b2b3f4211..a69eadca1 100644
--- a/src/plugins/attachwarner/Makefile.am
+++ b/src/plugins/attachwarner/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,32 +12,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_ATTACHWARNER_PLUGIN
@@ -65,7 +39,4 @@ attachwarner_la_SOURCES = \
 	attachwarner_prefs.c \
 	attachwarner_prefs.h
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/attachwarner/claws.def b/src/plugins/attachwarner/claws.def
deleted file mode 100644
index 64010d0b8..000000000
--- a/src/plugins/attachwarner/claws.def
+++ /dev/null
@@ -1,31 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-get_locale_dir
-check_plugin_version
-alertpanel
-conv_codeset_strdup
-conv_get_locale_charset_str_no_utf8
-debug_print_real
-debug_srcname
-get_rc_dir 
-hooks_register_hook
-hooks_unregister_hook
-line_has_quote_char
-matcherlist_free
-matcherlist_match
-matcherlist_new
-matcherprop_new
-pref_get_escaped_pref
-pref_get_unescaped_pref
-prefs_common
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-prefs_common_get_prefs
-matcherlist_new_from_lines
diff --git a/src/plugins/attachwarner/plugin.def b/src/plugins/attachwarner/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/attachwarner/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index 1dddb45c2..679bbbb1e 100644
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -11,32 +11,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_BSFILTER_PLUGIN
@@ -64,7 +38,4 @@ bsfilter_la_SOURCES = \
 	bsfilter.h \
 	bsfilter_gtk.c
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/bsfilter/claws.def b/src/plugins/bsfilter/claws.def
deleted file mode 100644
index 9512ffc9c..000000000
--- a/src/plugins/bsfilter/claws.def
+++ /dev/null
@@ -1,56 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-get_locale_dir
-check_plugin_version
-alertpanel
-claws_get_startup_dir
-conv_codeset_strdup
-conv_get_locale_charset_str_no_utf8
-debug_print_real
-debug_srcname
-get_rc_dir 
-hooks_register_hook
-hooks_unregister_hook
-line_has_quote_char
-matcherlist_free
-matcherlist_match
-matcherlist_new
-matcherprop_new
-pref_get_escaped_pref
-pref_get_unescaped_pref
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-prefs_common_get_prefs
-addressbook_folder_selection
-alertpanel_error
-combobox_text_new
-end_address_completion
-execute_command_line
-folder_find_item_from_identifier
-folder_get_default_trash
-folder_item_get_identifier
-folder_item_get_path
-folder_item_remove_msg
-foldersel_folder_sel
-found_in_addressbook
-gtkut_get_browse_directory_btn
-log_error
-prefs_button_toggled
-prefs_button_toggled follow
-procmsg_get_message_file
-procmsg_msginfo_set_flags
-procmsg_msginfo_unset_flags
-procmsg_register_spam_learner
-procmsg_spam_set_folder
-procmsg_unregister_spam_learner
-start_address_completion
-statusbar_pop_all
-statusbar_print_all
-statusbar_progress_all
diff --git a/src/plugins/bsfilter/plugin.def b/src/plugins/bsfilter/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/bsfilter/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 989a7440c..61c2e42d1 100644
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -11,32 +11,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_FANCY_PLUGIN
@@ -70,7 +44,4 @@ fancy_la_SOURCES = \
 	fancy_viewer.c \
 	fancy_viewer.h
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/fancy/claws.def b/src/plugins/fancy/claws.def
deleted file mode 100644
index b417d8368..000000000
--- a/src/plugins/fancy/claws.def
+++ /dev/null
@@ -1,99 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-addressbook_folder_selection
-alertpanel
-alertpanel_error
-check_plugin_version
-claws_do_idle
-claws_fopen
-claws_fdopen
-claws_fclose
-claws_safe_fclose
-claws_ssl_get_cert_file
-combobox_get_active_data
-combobox_select_by_data
-combobox_text_new
-complete_address
-compose_new
-conv_codeset_strdup
-conv_get_locale_charset_str
-conv_get_locale_charset_str_no_utf8
-debug_print_real
-debug_srcname
-end_address_completion
-extract_address
-file_exist
-file_read_to_str_no_recode
-filesel_select_file_open
-filesel_select_file_save
-folder_find_item_from_identifier
-folder_get_default_trash
-folder_item_get_identifier
-folder_item_get_path
-folder_item_remove_msg
-foldersel_folder_sel
-folder_subscribe
-get_complete_address
-get_locale_dir
-get_rc_dir
-gtkut_get_browse_directory_btn
-gtkut_get_browse_file_btn
-gtkut_get_options_frame
-gtkutils_scroll_one_line
-gtkutils_scroll_page
-gtkut_sc_combobox_create
-hooks_register_hook
-hooks_unregister_hook
-is_dir_exist
-line_has_quote_char
-log_error
-make_dir
-matcherlist_free
-matcherlist_match
-matcherlist_new
-matcherprop_new
-mimeview_register_viewer_factory
-mimeview_unregister_viewer_factory
-noticeview_hide
-open_txt_editor
-open_uri
-plugin_get_loaded_by_name
-pref_get_escaped_pref
-pref_get_pref_from_entry
-pref_get_unescaped_pref
-prefs_button_toggled
-prefs_button_toggled follow
-prefs_common
-prefs_common_get_ext_editor_cmd
-prefs_common_get_prefs
-prefs_common_get_uri_cmd
-pref_set_entry_from_pref
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-printing_get_page_setup
-printing_get_settings
-printing_store_settings
-procmime_get_part
-procmime_get_tmp_file_name
-procmime_mimeinfo_get_parameter
-procmime_mimeinfo_next
-procmsg_get_message_file
-procmsg_msginfo_set_flags
-procmsg_msginfo_unset_flags
-procmsg_register_spam_learner
-procmsg_spam_set_folder
-procmsg_unregister_spam_learner
-settings
-start_address_completion
-statusbar_pop_all
-statusbar_print_all
-statusbar_progress_all
-str_write_to_file
-subst_char
diff --git a/src/plugins/fancy/plugin.def b/src/plugins/fancy/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/fancy/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
index fd39d4a52..00995c1cf 100644
--- a/src/plugins/fetchinfo/Makefile.am
+++ b/src/plugins/fetchinfo/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,32 +12,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_FETCHINFO_PLUGIN
@@ -63,7 +37,4 @@ fetchinfo_la_SOURCES = \
 	fetchinfo_plugin.h \
 	fetchinfo_plugin_gtk.c
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/fetchinfo/claws.def b/src/plugins/fetchinfo/claws.def
deleted file mode 100644
index 2a16ae652..000000000
--- a/src/plugins/fetchinfo/claws.def
+++ /dev/null
@@ -1,32 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-get_locale_dir
-check_plugin_version
-alertpanel
-conv_codeset_strdup
-conv_get_locale_charset_str_no_utf8
-debug_print_real
-debug_srcname
-get_rc_dir 
-hooks_register_hook
-hooks_unregister_hook
-line_has_quote_char
-matcherlist_free
-matcherlist_match
-matcherlist_new
-matcherprop_new
-pref_get_escaped_pref
-pref_get_unescaped_pref
-prefs_common
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-prefs_common_get_prefs
-qp_encode_line
-get_rfc822_date
diff --git a/src/plugins/fetchinfo/plugin.def b/src/plugins/fetchinfo/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/fetchinfo/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/libravatar/Makefile.am b/src/plugins/libravatar/Makefile.am
index 4a3011aa7..8b49af7db 100644
--- a/src/plugins/libravatar/Makefile.am
+++ b/src/plugins/libravatar/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,32 +12,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_LIBRAVATAR_PLUGIN
@@ -75,7 +49,4 @@ libravatar_la_SOURCES = \
 	libravatar_prefs.c \
 	libravatar_prefs.h
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/libravatar/claws.def b/src/plugins/libravatar/claws.def
deleted file mode 100644
index 42b5e1de7..000000000
--- a/src/plugins/libravatar/claws.def
+++ /dev/null
@@ -1,46 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-alertpanel_error
-alertpanel_full
-alertpanel_notice
-alertpanel_warning
-auto_configure_service_sync
-claws_unlink
-claws_fopen
-claws_fdopen
-claws_fclose
-claws_safe_fclose
-claws_ssl_get_cert_file
-extract_address
-get_locale_dir
-check_plugin_version
-conv_codeset_strdup
-conv_get_locale_charset_str_no_utf8
-debug_print_real
-debug_srcname
-file_exist
-get_rc_dir
-gtkut_stock_button
-hooks_register_hook
-hooks_unregister_hook
-is_dir_exist
-line_has_quote_char
-make_dir
-md5_hex_digest
-pref_get_escaped_pref
-pref_get_unescaped_pref
-prefs_common
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-prefs_common_get_prefs
-procmsg_msginfo_add_avatar
-procmsg_msginfo_get_avatar
-slist_free_strings_full
-to_human_readable
diff --git a/src/plugins/libravatar/plugin.def b/src/plugins/libravatar/plugin.def
deleted file mode 100644
index 8471df184..000000000
--- a/src/plugins/libravatar/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-	plugin_desc
-	plugin_done
-	plugin_init
-	plugin_licence
-	plugin_name
-	plugin_type
-	plugin_provides
-	plugin_version
-
diff --git a/src/plugins/litehtml_viewer/Makefile.am b/src/plugins/litehtml_viewer/Makefile.am
index fcee147f6..771261d7f 100644
--- a/src/plugins/litehtml_viewer/Makefile.am
+++ b/src/plugins/litehtml_viewer/Makefile.am
@@ -1,10 +1,12 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
+include $(srcdir)/../win_plugin.mk
+
 SUBDIRS = litehtml
-EXTRA_DIST = claws.def plugin.def css.inc
+EXTRA_DIST = css.inc
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -13,34 +15,14 @@ IFLAGS = \
 	-I$(top_srcdir)/src/gtk \
 	-I$(top_srcdir)/src/plugins/litehtml_viewer/litehtml
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
 plugin_cppflags =
 
 if OS_WIN32
 
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
 plugin_cppflags += -DLITEHTML_UTF8
 
 endif
 
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_LITEHTML_VIEWER_PLUGIN
@@ -92,7 +74,4 @@ litehtml_viewer_la_SOURCES = \
 	lh_widget_wrapped.h \
 	plugin.c
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/litehtml_viewer/claws.def b/src/plugins/litehtml_viewer/claws.def
deleted file mode 100644
index d55ea7ad1..000000000
--- a/src/plugins/litehtml_viewer/claws.def
+++ /dev/null
@@ -1,29 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-claws_ssl_get_cert_file
-conv_get_current_locale
-debug_print_real
-debug_srcname
-get_rc_dir
-gtkut_get_options_frame
-gtkut_widget_draw_now
-gtkutils_scroll_one_line
-gtkutils_scroll_page
-mainwindow_get_mainwindow
-mimeview_register_viewer_factory
-mimeview_unregister_viewer_factory
-open_uri
-prefs_common_get_uri_cmd
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-procmime_get_part_as_pixbuf
-procmime_get_part_as_string
-procmime_mimeinfo_get_parameter
-procmime_mimeinfo_next
diff --git a/src/plugins/litehtml_viewer/plugin.def b/src/plugins/litehtml_viewer/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/litehtml_viewer/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index 345fc047d..f2dfc3fb1 100644
--- a/src/plugins/mailmbox/Makefile.am
+++ b/src/plugins/mailmbox/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -11,32 +11,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_MAILMBOX_PLUGIN
@@ -89,7 +63,4 @@ mailmbox_la_SOURCES = \
 	plugin_gtk.c \
 	plugin_gtk.h
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/mailmbox/claws.def b/src/plugins/mailmbox/claws.def
deleted file mode 100644
index 0efcc45e6..000000000
--- a/src/plugins/mailmbox/claws.def
+++ /dev/null
@@ -1,34 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-get_locale_dir
-check_plugin_version
-alertpanel
-claws_fopen
-claws_fdopen
-claws_fclose
-claws_safe_fclose
-conv_codeset_strdup
-conv_get_locale_charset_str_no_utf8
-debug_print_real
-debug_srcname
-get_rc_dir 
-hooks_register_hook
-hooks_unregister_hook
-line_has_quote_char
-matcherlist_free
-matcherlist_match
-matcherlist_new
-matcherprop_new
-pref_get_escaped_pref
-pref_get_unescaped_pref
-prefs_common
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-prefs_common_get_prefs
diff --git a/src/plugins/mailmbox/plugin.def b/src/plugins/mailmbox/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/mailmbox/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/managesieve/Makefile.am b/src/plugins/managesieve/Makefile.am
index 6ebea879a..456c77dc4 100644
--- a/src/plugins/managesieve/Makefile.am
+++ b/src/plugins/managesieve/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,32 +12,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_MANAGESIEVE_PLUGIN
@@ -72,7 +46,4 @@ managesieve_la_SOURCES = \
 	sieve_prefs.c \
 	sieve_prefs.h
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/managesieve/claws.def b/src/plugins/managesieve/claws.def
deleted file mode 100644
index 69ae44b83..000000000
--- a/src/plugins/managesieve/claws.def
+++ /dev/null
@@ -1,76 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-account_find_from_id
-account_get_list
-alertpanel
-alertpanel_error
-alertpanel_full
-check_plugin_version
-cm_menu_create_action_group_full
-cm_menu_set_sensitive_full
-combobox_get_active_data
-combobox_select_by_data
-debug_print_real
-debug_srcname
-get_rc_dir
-gtkut_get_options_frame
-gtkut_sc_combobox_create
-gtkut_stock_button
-gtkut_stock_button_set_create
-gtkut_stock_with_text_button_set_create
-gtkut_text_view_search_string
-gtkut_text_view_search_string_backward
-gtkut_text_view_set_position
-gtkut_window_new
-input_dialog
-input_dialog_query_password_keep
-log_print
-log_warning
-mainwindow_get_mainwindow
-manage_window_destroy
-manage_window_focus_in
-manage_window_focus_out
-manage_window_unmap
-md5_hex_hmac
-message_search_other
-passcrypt_decrypt
-password_get
-passwd_store_get
-passwd_store_get_account
-passwd_store_set_account
-passwd_store_has_password_account
-prefs_account_get_privacy_prefs
-prefs_account_register_page
-prefs_account_set_privacy_prefs
-prefs_account_unregister_page
-prefs_button_toggled
-prefs_common_get_prefs
-prefs_file_close
-prefs_file_close_revert
-prefs_set_default
-prefs_read_config
-prefs_set_block_label
-prefs_write_open
-prefs_write_param
-session_connect
-session_destroy
-session_disconnect
-session_init
-session_is_connected
-session_recv_msg
-session_register_ping
-session_send_msg
-session_set_recv_message_notify
-session_set_timeout
-session_start_tls
-sock_add_watch
-sock_read
-strretchomp
-undo_block
-undo_destroy
-undo_init
-undo_paste_clipboard
-undo_redo
-undo_set_change_state_func
-undo_unblock
-undo_undo
diff --git a/src/plugins/managesieve/plugin.def b/src/plugins/managesieve/plugin.def
deleted file mode 100644
index 8471df184..000000000
--- a/src/plugins/managesieve/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-	plugin_desc
-	plugin_done
-	plugin_init
-	plugin_licence
-	plugin_name
-	plugin_type
-	plugin_provides
-	plugin_version
-
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index 0cf6573a9..8fba4af3a 100644
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -1,8 +1,10 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
+include $(srcdir)/../win_plugin.mk
+
 if BUILD_HOTKEYS
 hotkey_lib = libcmnpgtkhotkey.la
 hotkey_lib_path = $(top_builddir)/src/plugins/notification/gtkhotkey/libcmnpgtkhotkey.la
@@ -12,7 +14,6 @@ hotkey_lib_path =
 endif
 
 SUBDIRS=gtkhotkey
-EXTRA_DIST = claws.def plugin.def
 
 IFLAGS = \
 	-I$(top_srcdir)/src/plugins/notification/gtkhotkey \
@@ -21,32 +22,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def $(hotkey_lib)
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_NOTIFICATION_PLUGIN
@@ -104,7 +79,4 @@ notification_la_SOURCES = \
 	notification_trayicon.c \
 	notification_trayicon.h
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/notification/claws.def b/src/plugins/notification/claws.def
deleted file mode 100644
index 806486d6d..000000000
--- a/src/plugins/notification/claws.def
+++ /dev/null
@@ -1,75 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-get_locale_dir
-check_plugin_version
-debug_print_real
-debug_srcname
-hooks_register_hook
-hooks_unregister_hook
-account_get_list
-addressbook_open
-alertpanel
-app_will_exit
-claws_is_exiting
-claws_is_starting
-compose_mail_cb
-compose_new
-compose_reply_from_messageview
-execute_command_line
-file_exist
-filesel_select_file_open
-folder_find_item_from_identifier
-folder_func_to_all_folders
-folder_get_list
-folder_has_parent_of_type
-folder_item_get_identifier
-folder_item_get_msg_list
-folder_item_get_name
-get_rc_dir
-gtkut_convert_int_to_gdk_color
-gtkut_get_browse_file_btn
-gtkut_stock_button_set_create
-gtkut_window_new
-inc_account_mail
-inc_all_account_mail_cb
-main_set_show_at_startup
-mainwindow_get_mainwindow
-main_window_hide
-main_window_empty_trash
-mainwindow_is_obscured
-mainwindow_jump_to
-main_window_show
-main_window_toggle_work_offline
-manage_window_destroy
-manage_window_focus_in
-manage_window_focus_out
-manage_window_set_transient
-manage_window_unmap
-cm_menu_create_action_group_full
-gtkut_ui_manager
-cm_menu_create_action_group
-cm_toggle_menu_set_active
-cm_menu_set_sensitive
-prefs_common_get_prefs
-prefs_common_translated_header_name
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-procmsg_get_message_file_path
-procmsg_msg_list_free
-stock_pixbuf_gdk
-stock_pixbuf_gdk follow
-xml_attr_new
-xml_file_put_xml_decl
-xml_free_tree
-xml_node_new
-xml_parse_file
-xml_tag_add_attr
-xml_tag_new
-xml_write_tree
diff --git a/src/plugins/notification/plugin.def b/src/plugins/notification/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/notification/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index a20918f28..7619b493a 100644
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,32 +12,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_PDF_VIEWER_PLUGIN
@@ -65,7 +39,4 @@ pdf_viewer_la_SOURCES = \
 	poppler_viewer.c \
 	poppler_viewer.h
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/pdf_viewer/claws.def b/src/plugins/pdf_viewer/claws.def
deleted file mode 100644
index 7cd57d3b1..000000000
--- a/src/plugins/pdf_viewer/claws.def
+++ /dev/null
@@ -1,37 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-alertpanel_error
-alertpanel_full
-alertpanel_warning
-check_plugin_version
-claws_unlink
-compose_new
-conv_get_locale_charset_str
-debug_print_real
-execute_command_line
-get_tmp_file
-gtkutils_scroll_one_line
-gtkutils_scroll_page
-input_dialog_with_invisible
-main_window_cursor_normal
-main_window_cursor_wait
-mainwindow_get_mainwindow
-mimeview_register_viewer_factory
-mimeview_unregister_viewer_factory
-open_uri
-prefs_common_get_uri_cmd
-printing_get_renderer_data
-printing_get_zoom
-printing_print_full
-printing_set_n_pages
-procmime_get_content_type_str
-procmime_get_mime_type
-procmime_get_part
-procmime_get_part_file_name
-procmime_get_tmp_file_name
-procmime_mimeinfo_get_parameter
-stock_pixbuf_gdk
-stock_pixmap_widget
-strretchomp
-summary_print
-to_human_readable
diff --git a/src/plugins/pdf_viewer/plugin.def b/src/plugins/pdf_viewer/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/pdf_viewer/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
index 3a2524aa1..5056758d3 100644
--- a/src/plugins/pgpcore/Makefile.am
+++ b/src/plugins/pgpcore/Makefile.am
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
+include $(srcdir)/../win_plugin.mk
+
 if BUILD_TESTS
 include $(top_srcdir)/tests.mk
 SUBDIRS = . tests
 endif
 
-EXTRA_DIST = claws.def plugin.def
-
 IFLAGS = \
 	-I$(top_builddir)/src \
 	-I$(top_builddir)/src/common \
@@ -17,32 +17,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_PGPCORE_PLUGIN
@@ -91,6 +65,3 @@ plugininclude_HEADERS = \
 	pgp_utils.h \
 	prefs_gpg.h \
 	sgpgme.h
-
-clean-local:
-	rm -f libclaws.a
diff --git a/src/plugins/pgpcore/claws.def b/src/plugins/pgpcore/claws.def
deleted file mode 100644
index 2ded33e41..000000000
--- a/src/plugins/pgpcore/claws.def
+++ /dev/null
@@ -1,81 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-addr_compl_add_address1
-account_get_default
-alertpanel
-alertpanel_error
-alertpanel_full
-alertpanel_notice
-check_plugin_version
-claws_do_idle
-claws_unlink
-claws_fopen
-claws_fdopen
-claws_fclose
-claws_safe_fclose
-conv_codeset_strdup
-conv_get_locale_charset_str_no_utf8
-codeconv_set_strict
-copy_file_part
-debug_print_real
-debug_srcname
-extract_address
-filesel_select_file_open
-hooks_register_hook
-hooks_unregister_hook
-get_rc_dir
-get_tmp_file
-gtkut_get_browse_file_btn
-gtkut_get_options_frame
-gtkut_stock_button_set_create
-gtkut_tree_view_get_selected_pointer
-gtkut_window_new
-input_dialog
-label_window_create
-label_window_destroy
-main_window_cursor_normal
-main_window_cursor_wait
-mainwindow_get_mainwindow
-manage_window_destroy
-manage_window_focus_in
-manage_window_focus_out
-manage_window_set_transient
-manage_window_unmap
-mimeview_register_viewer_factory
-mimeview_unregister_viewer_factory
-pref_set_entry_from_pref
-prefs_account_get_privacy_prefs
-prefs_account_register_page
-prefs_account_set_privacy_prefs
-prefs_account_unregister_page
-prefs_button_toggled
-prefs_button_toggled_reverse
-prefs_common_get_prefs
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-privacy_free_sig_check_task_result
-privacy_free_signature_data
-privacy_get_error
-privacy_set_error
-procmime_mimeinfo_get_parameter
-procmime_mimeinfo_parent
-procmime_decode_content
-procmime_get_tmp_file_name
-procmime_get_part
-textview_clear
-textview_create
-textview_cursor_normal
-textview_cursor_wait
-textview_destroy
-textview_init
-textview_set_font
-textview_show_icon
-textview_show_mime_part
-fast_strftime
diff --git a/src/plugins/pgpcore/plugin.def b/src/plugins/pgpcore/plugin.def
deleted file mode 100644
index c9803ee18..000000000
--- a/src/plugins/pgpcore/plugin.def
+++ /dev/null
@@ -1,31 +0,0 @@
-EXPORTS
-	plugin_desc
-	plugin_done
-	plugin_init
-	plugin_licence
-	plugin_name
-	plugin_provides
-	plugin_type
-	plugin_version
-
-	sgpgme_data_from_mimeinfo
-	sgpgme_data_release_and_get_mem
-	sgpgme_decrypt_verify
-	sgpgme_get_encrypt_data
-	sgpgme_setup_signers
-	sgpgme_sigstat_gpgme_to_privacy
-	sgpgme_sigstat_info_full
-	sgpgme_sigstat_info_short
-	sgpgme_verify_signature
-
-	gpgmegtk_passphrase_cb
-	prefs_gpg_add_skip_encryption_warning
-	prefs_gpg_enable_agent
-	prefs_gpg_remove_skip_encryption_warning
-	prefs_gpg_should_skip_encryption_warning
-	prefs_gpg_get_config
-
-	cm_gpgme_data_rewind
-
-	pgp_locate_armor_header
-	prefs_gpg_auto_check_signatures
diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
index ad4c67555..f191651a9 100644
--- a/src/plugins/pgpinline/Makefile.am
+++ b/src/plugins/pgpinline/Makefile.am
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def mypgpcore.def pgpinline.deps
+include $(srcdir)/../win_plugin.mk
+
+EXTRA_DIST = pgpinline.deps
 
 IFLAGS = \
 	-I$(top_builddir)/src/common \
@@ -11,34 +13,7 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-libmypgpcore.a: mypgpcore.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def libmypgpcore.a
-plugin_libadd += -L. -lclaws -lmypgpcore
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail ../pgpcore/pgpcore.la
-endif
+include $(srcdir)/../win_pgpcore.mk
 
 plugindir = $(pkglibdir)/plugins
 plugin_DATA=pgpinline.deps
@@ -69,7 +44,4 @@ pgpinline_la_SOURCES = \
 	pgpinline.h \
 	plugin.c
 
-clean-local:
-	rm -f libclaws.a libmypgpcore.a
-
 .PHONY: test
diff --git a/src/plugins/pgpinline/claws.def b/src/plugins/pgpinline/claws.def
deleted file mode 100644
index ed5ce6ee4..000000000
--- a/src/plugins/pgpinline/claws.def
+++ /dev/null
@@ -1,32 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-claws_unlink
-claws_fopen
-claws_fdopen
-claws_fclose
-claws_safe_fclose
-check_plugin_version
-codeconv_set_strict
-conv_codeset_strdup
-conv_get_locale_charset_str_no_utf8
-debug_print_real
-debug_srcname
-file_read_stream_to_str_no_recode
-get_mime_tmp_dir
-my_tmpfile
-privacy_free_sig_check_task_result
-privacy_free_signature_data
-privacy_register_system
-privacy_reset_error
-privacy_set_error
-privacy_unregister_system
-procmime_decode_content
-procmime_encode_content
-procmime_mimeinfo_free_all
-procmime_mimeinfo_get_parameter
-procmime_mimeinfo_parent
-procmime_scan_file
-procmime_write_mimeinfo
-procmime_get_part
-procmime_get_part_as_string
-procmime_get_tmp_file_name
diff --git a/src/plugins/pgpinline/mypgpcore.def b/src/plugins/pgpinline/mypgpcore.def
deleted file mode 100644
index dbebe9b96..000000000
--- a/src/plugins/pgpinline/mypgpcore.def
+++ /dev/null
@@ -1,18 +0,0 @@
-LIBRARY PGPCORE.DLL
-EXPORTS
-gpgmegtk_passphrase_cb
-prefs_gpg_add_skip_encryption_warning
-prefs_gpg_enable_agent
-prefs_gpg_get_config
-prefs_gpg_remove_skip_encryption_warning
-prefs_gpg_should_skip_encryption_warning
-sgpgme_data_release_and_get_mem
-sgpgme_decrypt_verify
-sgpgme_get_encrypt_data
-sgpgme_setup_signers
-sgpgme_sigstat_gpgme_to_privacy
-sgpgme_sigstat_info_full
-sgpgme_sigstat_info_short
-sgpgme_verify_signature
-pgp_locate_armor_header
-prefs_gpg_auto_check_signatures
diff --git a/src/plugins/pgpinline/plugin.def b/src/plugins/pgpinline/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/pgpinline/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
index 01c07bcc2..1e6cc7f94 100644
--- a/src/plugins/pgpmime/Makefile.am
+++ b/src/plugins/pgpmime/Makefile.am
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def mypgpcore.def pgpmime.deps
+include $(srcdir)/../win_plugin.mk
+
+EXTRA_DIST = pgpmime.deps
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,37 +14,9 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-libmypgpcore.a: mypgpcore.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def libmypgpcore.a
-plugin_libadd += -L. -lclaws -lmypgpcore
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail ../pgpcore/pgpcore.la
-endif
+include $(srcdir)/../win_pgpcore.mk
 
 plugindir = $(pkglibdir)/plugins
-
 plugin_DATA=pgpmime.deps
 
 if BUILD_PGPMIME_PLUGIN
@@ -73,7 +47,4 @@ pgpmime_la_SOURCES = \
 	pgpmime.h \
 	plugin.c
 
-clean-local:
-	rm -f libclaws.a libmypgpcore.a
-
 .PHONY: test
diff --git a/src/plugins/pgpmime/claws.def b/src/plugins/pgpmime/claws.def
deleted file mode 100644
index 8dfafcefb..000000000
--- a/src/plugins/pgpmime/claws.def
+++ /dev/null
@@ -1,26 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-canonicalize_str
-check_plugin_version
-claws_fclose
-claws_fdopen
-claws_fopen
-claws_safe_fclose
-debug_print_real
-debug_srcname
-file_read_stream_to_str
-generate_mime_boundary
-get_mime_tmp_dir
-my_tmpfile
-privacy_free_signature_data
-privacy_register_system
-privacy_reset_error
-privacy_set_error
-privacy_unregister_system
-procmime_get_part_as_string
-procmime_mimeinfo_free_all
-procmime_mimeinfo_get_parameter
-procmime_mimeinfo_new
-procmime_mimeinfo_parent
-procmime_scan_file
-procmime_write_mimeinfo
diff --git a/src/plugins/pgpmime/mypgpcore.def b/src/plugins/pgpmime/mypgpcore.def
deleted file mode 100644
index a0e70c369..000000000
--- a/src/plugins/pgpmime/mypgpcore.def
+++ /dev/null
@@ -1,21 +0,0 @@
-LIBRARY PGPCORE.DLL
-EXPORTS
-cm_check_detached_sig_async
-cm_gpgme_data_rewind
-gpgmegtk_passphrase_cb
-pgp_locate_armor_header
-prefs_gpg_add_skip_encryption_warning
-prefs_gpg_auto_check_signatures
-prefs_gpg_enable_agent
-prefs_gpg_get_config
-prefs_gpg_remove_skip_encryption_warning
-prefs_gpg_should_skip_encryption_warning
-sgpgme_data_from_mimeinfo
-sgpgme_data_release_and_get_mem
-sgpgme_decrypt_verify
-sgpgme_get_encrypt_data
-sgpgme_setup_signers
-sgpgme_sigstat_gpgme_to_privacy
-sgpgme_sigstat_info_full
-sgpgme_sigstat_info_short
-sgpgme_verify_signature
diff --git a/src/plugins/pgpmime/plugin.def b/src/plugins/pgpmime/plugin.def
deleted file mode 100644
index 4e547b511..000000000
--- a/src/plugins/pgpmime/plugin.def
+++ /dev/null
@@ -1,9 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index 17cd05e8f..ace5c478f 100644
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@ -1,48 +1,22 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
+include $(srcdir)/../win_plugin.mk
+
 SUBDIRS = libfeed
 if BUILD_TESTS
 include $(top_srcdir)/tests.mk
 SUBDIRS += . tests
 endif
 
-EXTRA_DIST = claws.def plugin.def
-
 IFLAGS = \
 	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_RSSYL_PLUGIN
@@ -110,6 +84,3 @@ rssyl_la_SOURCES = \
 	rssyl_update_format.h \
 	strutils.c \
 	strutils.h
-
-clean-local:
-	rm -f libclaws.a
diff --git a/src/plugins/rssyl/claws.def b/src/plugins/rssyl/claws.def
deleted file mode 100644
index 14bc843b3..000000000
--- a/src/plugins/rssyl/claws.def
+++ /dev/null
@@ -1,130 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-alertpanel_error
-alertpanel_full
-change_dir
-check_plugin_version
-claws_do_idle
-claws_is_exiting
-claws_is_starting
-claws_ssl_get_cert_file
-claws_unlink
-claws_fopen
-claws_fdopen
-claws_fclose
-claws_safe_fclose
-cm_menu_set_sensitive_full
-conv_encode_header_full
-conv_unmime_header
-copy_file
-debug_print_real
-debug_srcname
-dirent_is_regular_file
-entity_decode
-file_exist
-filesel_select_file_open
-filesel_select_file_open_with_filter
-file_strip_crs
-folder_add
-folder_create_folder
-folder_destroy
-folder_find_child_item_by_name
-folder_find_from_path
-folder_func_to_all_folders
-folder_get_class_from_string
-folder_get_xml
-folder_init
-folder_is_child_of
-folder_item_add_msg
-folder_item_append
-folder_item_get_identifier
-folder_item_get_msginfo
-folder_item_get_name
-folder_item_get_path
-folder_item_get_xml
-folder_item_new
-folder_item_parent
-folder_item_prefs_copy_prefs
-folder_item_prefs_save_config
-folder_item_prefs_save_config_recursive
-folder_item_remove
-folder_item_rename
-folder_item_scan
-folder_item_search_msgs_local
-folder_item_set_xml
-folder_item_update_freeze
-folder_item_update_thaw
-folder_local_name_ok
-folder_new
-folder_register_class
-folder_scan_tree
-folder_set_xml
-folder_unregister_class
-folderview_close_opened
-folderview_freeze
-folderview_get_opened_item
-folderview_get_selected_item
-folderview_register_popup
-folderview_set
-folderview_thaw
-folderview_unregister_popup
-folderview_unselect
-folder_write_list
-get_locale_dir
-get_rc_dir
-get_tmp_file
-gtk_cmclist_freeze
-gtk_cmclist_get_type
-gtk_cmclist_thaw
-gtk_cmctree_get_type
-gtk_cmctree_is_ancestor
-gtk_cmctree_node_get_row_data
-gtkut_get_browse_file_btn
-gtkut_window_new
-inc_offline_should_override
-input_dialog
-is_dir_exist
-is_file_entry_exist
-itos
-log_error
-log_print
-log_warning
-main_window_cursor_normal
-main_window_cursor_wait
-mainwindow_get_mainwindow
-make_dir
-make_dir_hier
-mh_get_class
-move_file
-msgcache_destroy
-passwd_store_get
-passwd_store_set
-prefs_common_get_prefs
-prefs_file_close
-prefs_file_close_revert
-prefs_filtering_delete_path
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_matcher_write_config
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_toolbar_register_plugin_item
-prefs_toolbar_unregister_plugin_item
-prefs_write_open
-prefs_write_param
-procheader_date_parse
-procheader_parse_file
-procmsg_get_message_file
-procmsg_msginfo_free
-procmsg_msginfo_unset_flags
-remove_dir_recursive
-slist_free_strings_full
-strtailchomp
-subst_for_shellsafe_filename
-summary_clear_all
-summary_show
-to_number
-trim_string
-xml_attr_new
-xml_tag_add_attr
diff --git a/src/plugins/rssyl/plugin.def b/src/plugins/rssyl/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/rssyl/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am
index edb5ec166..05c1ea8b0 100644
--- a/src/plugins/smime/Makefile.am
+++ b/src/plugins/smime/Makefile.am
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def mypgpcore.def smime.deps
+include $(srcdir)/../win_plugin.mk
+
+EXTRA_DIST = smime.deps
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,34 +14,7 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-libmypgpcore.a: mypgpcore.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def libmypgpcore.a
-plugin_libadd += -L. -lclaws -lmypgpcore
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail ../pgpcore/pgpcore.la
-endif
+include $(srcdir)/../win_pgpcore.mk
 
 plugindir = $(pkglibdir)/plugins
 plugin_DATA=smime.deps
@@ -72,7 +47,4 @@ smime_la_SOURCES = \
 	smime.c \
 	smime.h
 
-clean-local:
-	rm -f libclaws.a libmypgpcore.a
-
 .PHONY: test
diff --git a/src/plugins/smime/claws.def b/src/plugins/smime/claws.def
deleted file mode 100644
index 77e8fd836..000000000
--- a/src/plugins/smime/claws.def
+++ /dev/null
@@ -1,37 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-alertpanel_error
-canonicalize_file_replace
-canonicalize_str
-check_plugin_version
-claws_fclose
-claws_fdopen
-claws_fopen
-claws_safe_fclose
-claws_unlink
-debug_print_real
-debug_srcname
-file_read_stream_to_str
-file_read_stream_to_str_no_recode
-file_read_to_str
-generate_mime_boundary
-get_mime_tmp_dir
-get_tmp_file
-my_tmpfile
-privacy_free_sig_check_task_result
-privacy_free_signature_data
-privacy_register_system
-privacy_set_error
-privacy_unregister_system
-procmime_decode_content
-procmime_encode_content
-procmime_get_part
-procmime_get_part_as_string
-procmime_mimeinfo_free_all
-procmime_mimeinfo_get_parameter
-procmime_mimeinfo_new
-procmime_mimeinfo_parent
-procmime_scan_file
-procmime_write_mime_header
-procmime_write_mimeinfo
-str_write_to_file
diff --git a/src/plugins/smime/mypgpcore.def b/src/plugins/smime/mypgpcore.def
deleted file mode 100644
index f2a911c61..000000000
--- a/src/plugins/smime/mypgpcore.def
+++ /dev/null
@@ -1,20 +0,0 @@
-LIBRARY PGPCORE.DLL
-EXPORTS
-cm_check_detached_sig_async
-cm_gpgme_data_rewind
-gpgmegtk_passphrase_cb
-prefs_gpg_add_skip_encryption_warning
-prefs_gpg_auto_check_signatures
-prefs_gpg_enable_agent
-prefs_gpg_get_config
-prefs_gpg_remove_skip_encryption_warning
-prefs_gpg_should_skip_encryption_warning
-sgpgme_data_from_mimeinfo
-sgpgme_data_release_and_get_mem
-sgpgme_decrypt_verify
-sgpgme_get_encrypt_data
-sgpgme_setup_signers
-sgpgme_sigstat_gpgme_to_privacy
-sgpgme_sigstat_info_full
-sgpgme_sigstat_info_short
-sgpgme_verify_signature
diff --git a/src/plugins/smime/plugin.def b/src/plugins/smime/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/smime/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index 8cdc58658..9ea856304 100644
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -11,32 +11,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_SPAM_REPORT_PLUGIN
@@ -65,7 +39,4 @@ spamreport_la_SOURCES = \
 	spam_report_prefs.c \
 	spam_report_prefs.h
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/spam_report/claws.def b/src/plugins/spam_report/claws.def
deleted file mode 100644
index 36c730d6d..000000000
--- a/src/plugins/spam_report/claws.def
+++ /dev/null
@@ -1,56 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-alertpanel
-base64_encode
-check_plugin_version
-claws_ssl_get_cert_file
-compose_entry_append
-compose_forward
-compose_send
-conv_codeset_strdup
-conv_get_locale_charset_str_no_utf8
-debug_print_real
-debug_srcname
-file_read_to_str
-folder_item_update_freeze
-folder_item_update_thaw
-get_locale_dir
-get_rc_dir 
-gtk_cmclist_freeze
-gtk_cmclist_get_type
-gtk_cmclist_thaw
-hooks_register_hook
-hooks_unregister_hook
-inc_lock_count
-inc_lock_real
-inc_unlock_real
-line_has_quote_char
-log_error
-main_window_cursor_normal
-main_window_cursor_wait
-mainwindow_get_mainwindow
-matcherlist_free
-matcherlist_match
-matcherlist_new
-matcherprop_new
-passwd_store_get
-passwd_store_set
-passwd_store_write_config
-pref_get_escaped_pref
-pref_get_unescaped_pref
-prefs_common
-prefs_common_get_prefs
-prefs_file_close
-prefs_file_close_revert
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-procheader_get_header_from_msginfo
-procmsg_get_message_file
-statusbar_progress_all
-summary_get_selected_msg_list
-summary_is_locked
diff --git a/src/plugins/spam_report/plugin.def b/src/plugins/spam_report/plugin.def
deleted file mode 100644
index 4e547b511..000000000
--- a/src/plugins/spam_report/plugin.def
+++ /dev/null
@@ -1,9 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
index c88e2bd56..8cbbbda8f 100644
--- a/src/plugins/tnef_parse/Makefile.am
+++ b/src/plugins/tnef_parse/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,32 +12,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_TNEF_PARSE_PLUGIN
@@ -65,7 +39,4 @@ tnef_parse_la_SOURCES = \
 	tnef_dump.h \
 	tnef_parse.c
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/tnef_parse/claws.def b/src/plugins/tnef_parse/claws.def
deleted file mode 100644
index b55dd9cd8..000000000
--- a/src/plugins/tnef_parse/claws.def
+++ /dev/null
@@ -1,21 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-claws_fopen
-claws_fdopen
-claws_fclose
-claws_safe_fclose
-get_locale_dir
-check_plugin_version
-claws_unlink
-debug_get_mode
-debug_print_real
-debug_srcname
-get_mime_tmp_dir
-get_tmpfile_in_dir
-procmime_decode_content
-procmime_get_media_type
-procmime_get_mime_type
-procmime_mimeinfo_free_all
-procmime_mimeinfo_new
-procmime_mimeparser_register
-procmime_mimeparser_unregister
diff --git a/src/plugins/tnef_parse/plugin.def b/src/plugins/tnef_parse/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/tnef_parse/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
index 74dc47cdf..0367694c1 100644
--- a/src/plugins/vcalendar/Makefile.am
+++ b/src/plugins/vcalendar/Makefile.am
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 the Claws Mail team.
+# Copyright 1999-2022 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
 
-EXTRA_DIST = claws.def plugin.def
+include $(srcdir)/../win_plugin.mk
 
 IFLAGS = \
 	-I$(top_builddir)/src \
@@ -12,32 +12,6 @@ IFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk
 
-plugin_ldflags =
-plugin_extra_deps =
-plugin_libadd =
-
-if OS_WIN32
-
-libclaws.a: claws.def
-	$(DLLTOOL) --output-lib $@ --def $<
-
-%.lo : %.rc
-	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
-
-plugin_ldflags += \
-	-Wl,.libs/version.o \
-	-no-undefined \
-	-export-symbols $(srcdir)/plugin.def
-plugin_extra_deps += libclaws.a version.lo plugin.def
-plugin_libadd += -L. -lclaws
-
-endif
-
-if CYGWIN
-plugin_ldflags += -no-undefined
-plugin_libadd += -L$(top_builddir)/src -lclaws-mail
-endif
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_VCALENDAR_PLUGIN
@@ -83,7 +57,4 @@ vcalendar_la_SOURCES = \
 	vcalendar.c \
 	vcalendar.h
 
-clean-local:
-	rm -f libclaws.a
-
 .PHONY: test
diff --git a/src/plugins/vcalendar/claws.def b/src/plugins/vcalendar/claws.def
deleted file mode 100644
index e8791eb7f..000000000
--- a/src/plugins/vcalendar/claws.def
+++ /dev/null
@@ -1,177 +0,0 @@
-LIBRARY CLAWS-MAIL.EXE
-EXPORTS
-get_locale_dir
-check_plugin_version
-account_find_from_address
-account_find_from_id
-account_get_default
-account_get_list
-account_get_special_folder
-address_completion_end
-address_completion_register_entry
-address_completion_start
-alertpanel
-alertpanel_error
-alertpanel_error_log
-alertpanel_full
-alertpanel_notice
-claws_do_idle
-claws_unlink
-claws_fopen
-claws_fdopen
-claws_fclose
-claws_safe_fclose
-claws_ssl_get_cert_file
-cm_menu_create_action_group_full
-cm_menu_set_sensitive_full
-cm_toggle_menu_set_active_full
-combobox_select_by_text
-combobox_set_popdown_strings
-conv_codeset_strdup
-conv_encode_header
-conv_encode_header_full
-conv_get_locale_charset_str
-conv_get_outgoing_charset_str
-account_get_cur_account
-debug_print_real
-debug_srcname
-execute_command_line
-extract_address
-file_exist
-file_read_stream_to_str
-file_read_to_str
-filesel_select_file_save
-folder_add
-folder_create_folder
-folder_find_child_item_by_name
-folder_find_from_name
-folder_get_xml
-folder_init
-folder_is_child_of
-folder_item_add_msg
-folder_item_append
-folder_item_fetch_msg
-folder_item_get_identifier
-folder_item_get_msginfo
-folder_item_get_msginfo_by_msgid
-folder_item_get_path
-folder_item_get_xml
-folder_item_new
-folder_item_parent
-folder_item_prefs_save_config_recursive
-folder_item_remove
-folder_item_remove_msg
-folder_item_rename
-folder_item_scan
-folder_item_scan_full
-folder_item_set_xml
-folder_item_update_freeze
-folder_item_update_thaw
-folder_new
-folder_register_class
-folder_scan_tree
-folder_set_xml
-folder_unregister_class
-folderview_check_new
-folderview_close_opened
-folderview_get_opened_item
-folderview_get_selected_item
-folderview_register_popup
-folderview_unregister_popup
-folderview_unselect
-folder_write_list
-generate_msgid
-get_domain_name
-get_home_dir
-get_rc_dir
-get_rfc822_date
-get_tmp_dir
-get_tmp_file
-gtk_cmclist_freeze
-gtk_cmclist_get_type
-gtk_cmclist_thaw
-gtk_cmctree_get_type
-gtk_cmctree_is_ancestor
-gtk_cmctree_node_get_row_data
-gtkut_convert_int_to_gdk_color
-gtkutils_scroll_one_line
-gtkutils_scroll_page
-gtkut_time_select_combo_new
-gtkut_time_select_get_time
-gtkut_time_select_select_by_time
-gtkut_ui_manager
-gtkut_window_new
-inc_lock_count
-inc_lock_real
-inc_offline_should_override
-inc_unlock_real
-input_dialog
-is_dir_exist
-list_free_strings
-list_free_strings_full
-log_error
-main_window_cursor_normal
-main_window_cursor_wait
-mainwindow_get_mainwindow
-main_window_set_menu_sensitive
-make_dir
-mimeview_register_viewer_factory
-mimeview_unregister_viewer_factory
-move_file
-open_uri
-prefs_account_generate_msgid
-prefs_button_toggled
-prefs_common
-prefs_common_get_uri_cmd
-prefs_common_get_prefs
-prefs_file_close
-prefs_file_close_revert
-prefs_filtering_delete_path
-prefs_gtk_register_page
-prefs_gtk_unregister_page
-prefs_read_config
-prefs_set_block_label
-prefs_set_default
-prefs_write_open
-prefs_write_param
-passwd_store_get
-passwd_store_set
-passwd_store_write_config
-procheader_parse_file
-procmime_get_first_encrypted_text_content
-procmime_get_first_text_content
-procmime_get_part
-procmime_get_part_as_string
-procmime_get_tmp_file_name
-procmime_mimeinfo_get_parameter
-procmsg_msginfo_free
-procmsg_msginfo_get_full_info
-procmsg_send_message_queue_with_lock
-qp_encode_line
-remove_dir_recursive
-slist_free_strings
-slist_free_strings_full
-statusbar_progress_all
-strcrlftrunc
-strretchomp
-str_write_to_file
-subst_for_filename
-summary_clear_all
-summary_display_msg_selected
-summary_get_selected_msg_list
-summary_is_locked
-summary_redisplay_msg
-summary_select_by_msgnum
-summary_show
-toolbar_main_set_sensitive
-trim_string
-tzoffset
-xml_attr_new
-xml_attr_new_int
-xml_file_put_xml_decl
-xml_free_tree
-xml_node_new
-xml_parse_file
-xml_tag_add_attr
-xml_tag_new
-xml_write_tree
diff --git a/src/plugins/vcalendar/plugin.def b/src/plugins/vcalendar/plugin.def
deleted file mode 100644
index 8916a5d7c..000000000
--- a/src/plugins/vcalendar/plugin.def
+++ /dev/null
@@ -1,10 +0,0 @@
-EXPORTS
-        plugin_desc
-        plugin_done
-        plugin_init
-        plugin_licence
-        plugin_name
-        plugin_type
-	plugin_provides
-        plugin_version
-
diff --git a/src/plugins/win_pgpcore.mk b/src/plugins/win_pgpcore.mk
new file mode 100644
index 000000000..5e0bc4b83
--- /dev/null
+++ b/src/plugins/win_pgpcore.mk
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 the Claws Mail team.
+# This file is part of Claws Mail package, and distributed under the
+# terms of the General Public License version 3 (or later).
+# See COPYING file for license details.
+
+if OS_WIN32
+plugin_extra_deps += ../pgpcore/.libs/pgpcore.dll.a
+plugin_ldflags += -Wl,-L../pgpcore/.libs -Wl,-lpgpcore
+endif
+
+if CYGWIN
+plugin_libadd += ../pgpcore/pgpcore.la
+endif
+
+
diff --git a/src/plugins/win_plugin.mk b/src/plugins/win_plugin.mk
new file mode 100644
index 000000000..91215ff03
--- /dev/null
+++ b/src/plugins/win_plugin.mk
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 the Claws Mail team.
+# This file is part of Claws Mail package, and distributed under the
+# terms of the General Public License version 3 (or later).
+# See COPYING file for license details.
+
+plugin_ldflags =
+plugin_extra_deps =
+plugin_libadd =
+
+if OS_WIN32
+
+%.lo : %.rc
+	$(LIBTOOL) --mode=compile --tag=RC $(RC) -i $< -o $@
+
+plugin_ldflags += \
+	-Wl,.libs/version.o \
+	-no-undefined
+plugin_extra_deps += version.lo
+plugin_libadd += -L$(top_builddir)/src -lclaws
+
+endif
+
+if CYGWIN
+plugin_ldflags += -no-undefined
+plugin_libadd += -L$(top_builddir)/src -lclaws-mail
+endif
+

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail

More information about the Commits mailing list