talons

commit b5fbdcae92746266b7879ab8a201f96da8a7c2e8
parent 83e871565fb04cb16cca129587cde16cb6c26a08
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 29 Aug 2011 14:56:59 +0000

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 `.'

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/pgpcore/Makefile.am
 | 
2
+-
M
src/plugins/pgpinline/Makefile.am
 | 
2
+-
M
src/plugins/pgpmime/Makefile.am
 | 
2
+-
M
src/plugins/smime/Makefile.am
 | 
2
+-

7 files changed, 15 insertions(+), 5 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 =