claws-mail: Fix building with new automake

Having the same file listed multiple times in Makefile.am breaks with new
Autotools

Signed-off-by: Joshua Lock <josh@linux.intel.com>
This commit is contained in:
Joshua Lock 2010-03-19 14:59:49 +00:00
parent 34e1b3ef1c
commit d296df4397
2 changed files with 28 additions and 2 deletions

View File

@ -3,13 +3,14 @@ DESCRIPTION = "Mail user agent"
#DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell openssl"
DEPENDS = "gtk+ libetpan openssl libowl"
LICENSE = "GPL"
PR = "r5"
PR = "r6"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \
file://desktop.patch;patch=1 \
file://streamline-ui.patch;patch=1 \
file://owl-window-menu.patch;patch=1 \
file://fix-build.patch;patch=1 \
"
FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
@ -35,11 +36,12 @@ EXTRA_OECONF = "--disable-aspell-test \
# --disable-libetpan \
--disable-gnomeprint \
--disable-valgrind \
--disable-static \
"
CFLAGS += "-D_GNU_SOURCE"
inherit autotools_stage pkgconfig gettext
inherit autotools pkgconfig gettext
do_install_append() {
install -d ${D}${datadir}/applications

View File

@ -0,0 +1,24 @@
Remove duplicate file entries as this breaks install with new Automake
JL 19/03/10
Index: claws-mail-2.9.1/src/gtk/Makefile.am
===================================================================
--- claws-mail-2.9.1.orig/src/gtk/Makefile.am 2007-03-22 07:52:47.000000000 +0000
+++ claws-mail-2.9.1/src/gtk/Makefile.am 2010-03-19 14:54:06.565828281 +0000
@@ -44,7 +44,6 @@
filesel.h \
foldersort.h \
gtkaspell.h \
- gtksctree.h \
gtkshruler.h \
gtksctree.h \
gtksourceprintjob.h \
@@ -57,7 +56,6 @@
menu.h \
pluginwindow.h \
prefswindow.h \
- gtkvscrollbutton.h \
progressdialog.h \
quicksearch.h \
sslcertwindow.h \