2011-08-29 [colin] 3.7.10cvs6

	* src/plugins/pgpcore/Makefile.am
	* src/plugins/pgpinline/Makefile.am
	* src/plugins/pgpmime/Makefile.am
	* src/plugins/smime/Makefile.am
		Windows build fix:
		libtool: link: require no space between `-L' and `.'

diff --git a/ChangeLog b/ChangeLog
index 31f4e85474b4a9e9ea72761c89a54ca94bc93094..4c9adf36d3bfd933a9afa277524829e12942239e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-29 [colin]     3.7.10cvs6
+
+       * src/plugins/pgpcore/Makefile.am
+       * src/plugins/pgpinline/Makefile.am
+       * src/plugins/pgpmime/Makefile.am
+       * src/plugins/smime/Makefile.am
+               Windows build fix:
+               libtool: link: require no space between `-L' and `.'
+
 2011-08-29 [colin]     3.7.10cvs5
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index c543160c699cbf77975f68504cf1a00737f3516a..8befb751e3e894ecbe8313b9faf1d1acd8786649 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4209,3 +4209,4 @@
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/image_viewer.c;  cvs diff -u -r 1.96.2.231 -r 1.96.2.232 src/textview.c;  cvs diff -u -r 1.5.2.94 -r 1.5.2.95 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.56 -r 1.4.2.57 src/gtk/gtkutils.h;  ) > 3.7.10cvs3.patchset
 ( cvs diff -u -r 1.382.2.578 -r 1.382.2.579 src/compose.c;  ) > 3.7.10cvs4.patchset
 ( cvs diff -u -r 1.61.2.97 -r 1.61.2.98 src/account.c;  cvs diff -u -r 1.382.2.579 -r 1.382.2.580 src/compose.c;  cvs diff -u -r 1.105.2.166 -r 1.105.2.167 src/prefs_account.c;  cvs diff -u -r 1.49.2.45 -r 1.49.2.46 src/prefs_account.h;  ) > 3.7.10cvs5.patchset
+( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpmime/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/smime/Makefile.am;  ) > 3.7.10cvs6.patchset

diff --git a/configure.ac b/configure.ac
index 95de5452d19e8e47b474474cd1ea23247dca8112..104c9846b0cc37f7f0f8f5c9ce82b96e0d729a05 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
index 5876615a384522c8cb763c0ce47facf3e09fc49d..3d645cd24db7226da82c162723e9eed82077b76e 100644 (file)
--- a/src/plugins/pgpcore/Makefile.am
+++ b/src/plugins/pgpcore/Makefile.am
@@ -19,7 +19,7 @@ plugin_deps = libclaws.a $(plugin_res) plugin.def
 libclaws.a: claws.def
        $(DLLTOOL) --output-lib $@ --def $<
 
-plugin_ldadd = -L . -lclaws
+plugin_ldadd = -L. -lclaws
 
 else
 plugin_res =

diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
index 9a9d8f6d64854425637b2756713c435f9c7e72c3..ba56c3fa2d070010d417fb51db9c3d85b1673fc5 100644 (file)
--- a/src/plugins/pgpinline/Makefile.am
+++ b/src/plugins/pgpinline/Makefile.am
@@ -23,7 +23,7 @@ libclaws.a: claws.def
 libmypgpcore.a: mypgpcore.def
        $(DLLTOOL) --output-lib $@ --def $<
 
-plugin_ldadd = -L . -lclaws  -lmypgpcore
+plugin_ldadd = -L. -lclaws  -lmypgpcore
 
 else
 plugin_res =

diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
index 9b41616bcb5ac348522447eda240536d627d44cb..42902577b33163d2efe892276f5caa370c35a04c 100644 (file)
--- a/src/plugins/pgpmime/Makefile.am
+++ b/src/plugins/pgpmime/Makefile.am
@@ -22,7 +22,7 @@ libclaws.a: claws.def
 libmypgpcore.a: mypgpcore.def
        $(DLLTOOL) --output-lib $@ --def $<
 
-plugin_ldadd = -L . -lclaws -lmypgpcore
+plugin_ldadd = -L. -lclaws -lmypgpcore
 
 else
 plugin_res =

diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am
index 7e485c571e475262af86f3af140479321cf79994..ccfb23f2d387db8c822839c7757ecaae54519aef 100644 (file)
--- a/src/plugins/smime/Makefile.am
+++ b/src/plugins/smime/Makefile.am
@@ -23,7 +23,7 @@ libclaws.a: claws.def
 libmypgpcore.a: mypgpcore.def
        $(DLLTOOL) --output-lib $@ --def $<
 
-plugin_ldadd = -L . -lclaws  -lmypgpcore
+plugin_ldadd = -L. -lclaws  -lmypgpcore
 
 else
 plugin_res =