talons

commit 20d68dd433fd3018131321b78412848795991067
parent 6e984bced892fdf6b29f2072107ebb45367236d2
Author: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date:   Fri, 13 Jun 2014 01:20:57 +0400

fix automake errors

src/plugins/fetchinfo/Makefile.am:83: warning: EXTRA_DIST multiply defined in condition TRUE ...
src/plugins/fetchinfo/Makefile.am:8: ... 'EXTRA_DIST' previously defined here
src/plugins/perl/Makefile.am:38: warning: EXTRA_DIST multiply defined in condition TRUE ...
src/plugins/perl/Makefile.am:8: ... 'EXTRA_DIST' previously defined here
src/plugins/pgpinline/Makefile.am:7: warning: appdata_DATA multiply defined in condition TRUE ...
src/plugins/pgpinline/Makefile.am:5: ... 'appdata_DATA' previously defined here
src/plugins/spamassassin/Makefile.am:42: warning: EXTRA_DIST multiply defined in condition TRUE ...
src/plugins/spamassassin/Makefile.am:8: ... 'EXTRA_DIST' previously defined here

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

Diffstat:
M
src/plugins/fetchinfo/Makefile.am
 | 
3
+--
M
src/plugins/perl/Makefile.am
 | 
3
+--
M
src/plugins/pgpinline/Makefile.am
 | 
2
+-
M
src/plugins/spamassassin/Makefile.am
 | 
4
+---

4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
@@ -5,7 +5,6 @@
 appdata_files = claws-mail-fetchinfo.metainfo.xml
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
 
 if OS_WIN32
 
@@ -80,4 +79,4 @@ fetchinfo_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS)
 
-EXTRA_DIST = claws.def plugin.def version.rc
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
@@ -5,7 +5,6 @@
 appdata_files = claws-mail-perl.metainfo.xml
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
 
 SUBDIRS = tools
 
@@ -35,5 +34,5 @@ perl_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(PERL_CFLAGS)
 
-EXTRA_DIST = cm_perl.pod
+EXTRA_DIST = cm_perl.pod $(appdata_files)
 
diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
@@ -2,7 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_DATA = claws-mail-pgpinline.metainfo.xml
+appdata_files = claws-mail-pgpinline.metainfo.xml
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_files)
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpinline.deps \
diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
@@ -5,7 +5,6 @@
 appdata_files = claws-mail-spamassasin.metainfo.xml
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_files)
-EXTRA_DIST = $(appdata_files)
 
 plugindir = $(pkglibdir)/plugins
 
@@ -39,5 +38,4 @@ spamassassin_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS)
 
-EXTRA_DIST = \
-	README
+EXTRA_DIST = README $(appdata_files)