2013-02-20 [colin] 3.9.0cvs96

	* src/plugins/att_remover/Makefile.am
	* src/plugins/fetchinfo/Makefile.am
	* src/plugins/spam_report/Makefile.am
		Fix missed parts for w32

diff --git a/ChangeLog b/ChangeLog
index cf6cd198edfb105fc4c6ad25b84c16e0841ec447..71220937f316ffa6c4c5e1ae73eab91e20244c44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-20 [colin]     3.9.0cvs96
+
+       * src/plugins/att_remover/Makefile.am
+       * src/plugins/fetchinfo/Makefile.am
+       * src/plugins/spam_report/Makefile.am
+               Fix missed parts for w32
+
 2013-02-20 [colin]     3.9.0cvs95
 
        * src/prefs_common.h

diff --git a/PATCHSETS b/PATCHSETS
index a82711abda46f9aff819366be48465152b60023d..90483547ae847626b33379526cc9942250087ba6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4593,3 +4593,4 @@
 ( cvs diff -u -r 1.13.2.48 -r 1.13.2.49 src/common/plugin.c;  ) > 3.9.0cvs93.patchset
 ( cvs diff -u -r 1.654.2.4670 -r 1.654.2.4671 configure.ac;  ) > 3.9.0cvs94.patchset
 ( cvs diff -u -r 1.103.2.144 -r 1.103.2.145 src/prefs_common.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/address_keeper/claws.def;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/att_remover/Makefile.am;  diff -u /dev/null src/plugins/att_remover/claws.def;  diff -u /dev/null src/plugins/att_remover/plugin.def;  diff -u /dev/null src/plugins/att_remover/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/clamd/libclamd/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fetchinfo/Makefile.am;  diff -u /dev/null src/plugins/fetchinfo/claws.def;  diff -u /dev/null src/plugins/fetchinfo/plugin.def;  diff -u /dev/null src/plugins/fetchinfo/version.rc;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/mailmbox/Makefile.am;  diff -u /dev/null src/plugins/mailmbox/claws.def;  diff -u /dev/null src/plugins/mailmbox/plugin.def;  diff -u /dev/null src/plugins/mailmbox/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/gtkhotkey/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/spam_report/Makefile.am;  diff -u /dev/null src/plugins/spam_report/claws.def;  diff -u /dev/null src/plugins/spam_report/plugin.def;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/spam_report/spam_report.c;  diff -u /dev/null src/plugins/spam_report/version.rc;  ) > 3.9.0cvs95.patchset
+( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/att_remover/Makefile.am;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/fetchinfo/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/spam_report/Makefile.am;  ) > 3.9.0cvs96.patchset

diff --git a/configure.ac b/configure.ac
index 1ce04a47261c1b5abac3aa7c8f50c3b28df74e61..ed21a3ffdc752504c520032619ca4d7e9adb23ba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=95
+EXTRA_VERSION=96
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index cf7f5764185d23cf2da3cc55e2c2f7062af00240..8369a684d59836506aa2a21a7e33168ca4bf771e 100644 (file)
--- a/src/plugins/att_remover/Makefile.am
+++ b/src/plugins/att_remover/Makefile.am
@@ -51,11 +51,15 @@ att_remover_la_SOURCES = \
        att_remover.c
 
 att_remover_la_LDFLAGS = \
-       -avoid-version -module
+       $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
+       -avoid-version -module \
+       $(GTK_LIBS)
 
-att_remover_la_LIBADD = \
+att_remover_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
        $(GTK_LIBS)
 
+att_remover_la_DEPENDENCIES = $(plugin_deps)
+
 AM_CPPFLAGS = \
        $(CLAWS_MAIL_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
index 65329dfffc5a7a49cc0067f7c55312be8c53ba71..c606743a65babb4982f63fcfb06c98f5e439aa6e 100644 (file)
--- a/src/plugins/fetchinfo/Makefile.am
+++ b/src/plugins/fetchinfo/Makefile.am
@@ -50,9 +50,15 @@ fetchinfo_la_SOURCES = \
        fetchinfo_plugin_gtk.c
 
 fetchinfo_la_LDFLAGS = \
+       $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
        -avoid-version -module \
        $(GTK_LIBS)
 
+fetchinfo_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
+       $(GTK_LIBS)
+
+fetchinfo_la_DEPENDENCIES = $(plugin_deps)
+
 AM_CPPFLAGS = \
        $(CLAWS_MAIL_CFLAGS) \
        $(GLIB_CFLAGS) \

diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index f0d57a3f1d3f10718ad8417d963d7cd4da7dceea..e4271d92d3be7a299790ae2f561fe002acabcb1b 100644 (file)
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -53,13 +53,16 @@ spamreport_la_SOURCES = \
         spam_report_prefs.h
 
 spamreport_la_LDFLAGS = \
+       $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
        -avoid-version -module \
        $(GTK_LIBS)
 
-spamreport_la_LIBADD = \
+spamreport_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
        $(CURL_LIBS) \
        $(GTK_LIBS)
 
+spamreport_la_DEPENDENCIES = $(plugin_deps)
+
 INCLUDES = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/common \