[Commits] Makefile.am 1.155.2.99 1.155.2.100

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv9815/src

Modified Files:
      Tag: gtk2
	Makefile.am 
Log Message:
2012-04-02 [colin]	3.8.0cvs38

	* src/Makefile.am
		Fix incomplete make dist

Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/claws/src/Makefile.am,v
retrieving revision 1.155.2.99
retrieving revision 1.155.2.100
diff -u -d -r1.155.2.99 -r1.155.2.100
--- Makefile.am	1 Apr 2012 18:45:25 -0000	1.155.2.99
+++ Makefile.am	2 Apr 2012 18:35:25 -0000	1.155.2.100
@@ -29,13 +29,57 @@
 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 @@
 	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 @@
 	pixmaps/tray_unreadmarkedmail.xpm \
 	pixmaps/empty.xpm \
 	pixmaps/replied_and_forwarded.xpm \
-	claws-contacts.xml
+	claws-contacts.xml \
+	$(abook_extra)
 
 
 INCLUDES = \