commit 809c4d457c1157a6ee76f7471955b8153e8c3d4d
parent 37658d35ae11f4e91d9407cfaf5d40666f552a1e
Author: Colin Leroy <colin@colino.net>
Date: Mon, 2 Apr 2012 18:35:26 +0000
2012-04-02 [colin] 3.8.0cvs38
* src/Makefile.am
Fix incomplete make dist
Diffstat:
4 files changed, 57 insertions(+), 45 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-02 [colin] 3.8.0cvs38
+
+ * src/Makefile.am
+ Fix incomplete make dist
+
2012-04-02 [colin] 3.8.0cvs37
* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4354,3 +4354,4 @@
( cvs diff -u -r 1.100.2.82 -r 1.100.2.83 AUTHORS; cvs diff -u -r 1.1.2.77 -r 1.1.2.78 src/gtk/authors.h; cvs diff -u -r 1.1.2.107 -r 1.1.2.108 src/gtk/quicksearch.c; ) > 3.8.0cvs35.patchset
( 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
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=37
+EXTRA_VERSION=38
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -29,13 +29,57 @@ claws_mail_res_ldflag =
claws_mail_deps =
endif
-if BUILD_NEWADDRBOOK
-abook_headers = \
- addressbook-dbus.h
-abook_source = \
+new_abook_source = \
addressbook-dbus.c
+old_abook_source = \
+ addrbook.c \
+ addrclip.c \
+ addrcustomattr.c \
+ addressbook.c \
+ addressbook_foldersel.c \
+ addrindex.c \
+ addrquery.c \
+ addrselect.c \
+ addrduplicates.c \
+ browseldap.c \
+ editaddress.c \
+ editaddress_other_attributes_ldap.c \
+ editbook.c \
+ editgroup.c \
+ editjpilot.c \
+ editldap_basedn.c \
+ editldap.c \
+ editvcard.c \
+ exphtmldlg.c \
+ expldifdlg.c \
+ exporthtml.c \
+ exportldif.c \
+ importldif.c \
+ importmutt.c \
+ importpine.c \
+ jpilot.c \
+ ldapctrl.c \
+ ldaplocate.c \
+ ldapquery.c \
+ ldapserver.c \
+ ldapupdate.c \
+ ldaputil.c \
+ ldif.c \
+ mutt.c \
+ pine.c \
+ vcard.c
+
+if BUILD_NEWADDRBOOK
+ abook_source = $(new_abook_source)
+ abook_extra = $(old_abook_source)
else
+ abook_source = $(old_abook_source)
+ abook_extra = $(new_abook_source)
+endif
+
abook_headers = \
+ addressbook-dbus.h \
+ adbookbase.h \
addrbook.h \
addrclip.h \
addrcustomattr.h \
@@ -73,45 +117,6 @@ abook_headers = \
pine.h \
vcard.h
-abook_source = \
- addrbook.c \
- addrclip.c \
- addrcustomattr.c \
- addressbook.c \
- addressbook_foldersel.c \
- addrindex.c \
- addrquery.c \
- addrselect.c \
- addrduplicates.c \
- browseldap.c \
- editaddress.c \
- editaddress_other_attributes_ldap.c \
- editbook.c \
- editgroup.c \
- editjpilot.c \
- editldap_basedn.c \
- editldap.c \
- editvcard.c \
- exphtmldlg.c \
- expldifdlg.c \
- exporthtml.c \
- exportldif.c \
- importldif.c \
- importmutt.c \
- importpine.c \
- jpilot.c \
- ldapctrl.c \
- ldaplocate.c \
- ldapquery.c \
- ldapserver.c \
- ldapupdate.c \
- ldaputil.c \
- ldif.c \
- mutt.c \
- pine.c \
- vcard.c
-endif
-
claws_mail_SOURCES = \
account.c \
action.c \
@@ -510,7 +515,8 @@ EXTRA_DIST = \
pixmaps/tray_unreadmarkedmail.xpm \
pixmaps/empty.xpm \
pixmaps/replied_and_forwarded.xpm \
- claws-contacts.xml
+ claws-contacts.xml \
+ $(abook_extra)
INCLUDES = \
