2012-04-02 [colin] 3.8.0cvs38

[claws.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 138cc204bdda1ec42f1533132d528caba0bae87a..00bb507a3b0dc068536a12a1d8e03bdb1c3c0eb9 100644 (file)
--- 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 = \