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>

diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
index 9fc2362dcbea5e52e3f52db7791fcdd657cc2263..20b4c8962fc5b76f56e34ee11b9a520b1a46feb2 100644 (file)
--- 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
index ec637ffc30e74cfec6b16bfab99a894ac92e5632..7d927853551ab464abc6078a128849abcca03f5c 100644 (file)
--- 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
index acdac80a3bf5091be68d6d9cf9ca70095bc371b9..a471d5367113227fa812d68173b3636adaef4329 100644 (file)
--- 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
index c64321174592518cf8f84a9d544cdc41bdda26b6..6d3996b206cfff056c834f58a8b28130be8c79f1 100644 (file)
--- 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)