talons

commit 48b320a1dcec8c89840105fb403a8108e2e49c22
parent 809c4d457c1157a6ee76f7471955b8153e8c3d4d
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  3 Apr 2012 08:41:31 +0000

2012-04-03 [colin]	3.8.0cvs39

	* src/Makefile.am
		Fix build (damn whitespace-sensitive file format)

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/Makefile.am
 | 
8
++++----

4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-03 [colin]	3.8.0cvs39
+
+	* src/Makefile.am
+		Fix build (damn whitespace-sensitive file format)
+
 2012-04-02 [colin]	3.8.0cvs38
 
 	* src/Makefile.am
diff --git a/PATCHSETS b/PATCHSETS
@@ -4355,3 +4355,4 @@
 ( cvs diff -u -r 1.654.2.4430 -r 1.654.2.4431 configure.ac;  cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/.cvsignore;  cvs diff -u -r 1.155.2.98 -r 1.155.2.99 src/Makefile.am;  cvs diff -u -r 1.27.2.60 -r 1.27.2.61 src/addr_compl.c;  cvs diff -u -r 1.9.2.34 -r 1.9.2.35 src/addressadd.c;  cvs diff -u -r 1.2.16.8 -r 1.2.16.9 src/addressadd.h;  diff -u /dev/null src/addressbook-dbus.c;  diff -u /dev/null src/addressbook-dbus.h;  cvs diff -u -r 1.5.10.36 -r 1.5.10.37 src/addrgather.c;  cvs diff -u -r 1.3.12.7 -r 1.3.12.8 src/addrgather.h;  cvs diff -u -r 1.6.10.25 -r 1.6.10.26 src/addrharvest.c;  cvs diff -u -r 1.4.12.8 -r 1.4.12.9 src/addrharvest.h;  diff -u /dev/null src/claws-contacts.xml;  cvs diff -u -r 1.382.2.598 -r 1.382.2.599 src/compose.c;  cvs diff -u -r 1.50.2.65 -r 1.50.2.66 src/compose.h;  cvs diff -u -r 1.60.2.61 -r 1.60.2.62 src/filtering.c;  cvs diff -u -r 1.8.2.34 -r 1.8.2.35 src/headerview.c;  cvs diff -u -r 1.115.2.247 -r 1.115.2.248 src/main.c;  cvs diff -u -r 1.274.2.343 -r 1.274.2.344 src/mainwindow.c;  cvs diff -u -r 1.94.2.230 -r 1.94.2.231 src/messageview.c;  cvs diff -u -r 1.204.2.208 -r 1.204.2.209 src/prefs_common.c;  cvs diff -u -r 1.1.4.73 -r 1.1.4.74 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.91 -r 1.43.2.92 src/prefs_matcher.c;  cvs diff -u -r 1.395.2.445 -r 1.395.2.446 src/summaryview.c;  cvs diff -u -r 1.96.2.239 -r 1.96.2.240 src/textview.c;  cvs diff -u -r 1.43.2.126 -r 1.43.2.127 src/toolbar.c;  cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.23.2.57 -r 1.23.2.58 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.14.2.79 -r 1.14.2.80 src/plugins/trayicon/trayicon.c;  ) > 3.8.0cvs36.patchset
 ( cvs diff -u -r 1.382.2.599 -r 1.382.2.600 src/compose.c;  ) > 3.8.0cvs37.patchset
 ( cvs diff -u -r 1.155.2.99 -r 1.155.2.100 src/Makefile.am;  ) > 3.8.0cvs38.patchset
+( cvs diff -u -r 1.155.2.100 -r 1.155.2.101 src/Makefile.am;  ) > 3.8.0cvs39.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -70,11 +70,11 @@ old_abook_source = \
 	vcard.c
 
 if BUILD_NEWADDRBOOK
-	abook_source = $(new_abook_source)
-	abook_extra = $(old_abook_source)
+abook_source = $(new_abook_source)
+abook_extra = $(old_abook_source)
 else
-	abook_source = $(old_abook_source)
-	abook_extra = $(new_abook_source)
+abook_source = $(old_abook_source)
+abook_extra = $(new_abook_source)
 endif
 
 abook_headers = \