fix this wonderful screw-up that broke `make dist`

diff --git a/Makefile.am b/Makefile.am
index db4b62c77355e3b5ba09810bf4d092554c01e50b..253a365f4d933e0a54ecfe163033bed4da28a0f0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = \
        claws-mail.pc.in \
        $(desktop_in_files) \
        claws-mail.png \
-       $(appdata_in_files) \
+       $(appdata_DATA) \
        autogen.sh \
        claws-features.h.in \
        version

diff --git a/src/plugins/acpi_notifier/Makefile.am b/src/plugins/acpi_notifier/Makefile.am
index 706a203b2db884045ee5455023b4808b5298fec6..2e71b2eda9a9a15f2251b674a058abb0506aeaa5 100644 (file)
--- a/src/plugins/acpi_notifier/Makefile.am
+++ b/src/plugins/acpi_notifier/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 

diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index 54fbb32e13418b8bde868291461f9c28cbfc9c11..f9f32098b0e58bc218a731e888a7b59ba7c3fca9 100644 (file)
--- a/src/plugins/address_keeper/Makefile.am
+++ b/src/plugins/address_keeper/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
index 6752e67171843ff9544854ff8c5c53dd67b064c4..a66d9ccadb0620d6550ea0f7f72b2b85bb20b0fa 100644 (file)
--- a/src/plugins/archive/Makefile.am
+++ b/src/plugins/archive/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 

diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index 5609912226066243575d92c8f203bb6231734fbe..6eaff6f76a0ce7331e068d2cebd472d56468b8bc 100644 (file)
--- a/src/plugins/att_remover/Makefile.am
+++ b/src/plugins/att_remover/Makefile.am
@@ -7,7 +7,7 @@ appdatadir=$(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am
index 317a3b2729ef2a263c68b1f73b4ab7080c52fcc7..2141bbb2b49e4be540a55bc70ad31018887fae4d 100644 (file)
--- a/src/plugins/attachwarner/Makefile.am
+++ b/src/plugins/attachwarner/Makefile.am
@@ -6,7 +6,7 @@ appdata_in_files = claws-mail-attachwarner.metainfo.xml.in
 appdatadir=$(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am
index 9d01cde4d72f6228211e228c5ac4782c517f22ec..326a30632551272705fe9b518aa9eb62e12ce696 100644 (file)
--- a/src/plugins/bogofilter/Makefile.am
+++ b/src/plugins/bogofilter/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 

diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index 7332c3aa1d50ff4b4a0253e0c19cb91c80b417db..bb42bc941b808091cb8473f947474b69cbf8d0d6 100644 (file)
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -5,7 +5,7 @@
 appdata_files = claws-mail-bsfilter.metainfo.xml
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_files)
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
index d38d37fd87106682146f40f69a0f7e87ae6c2d82..8f443971c9aa3f2ccd4985364efcb1ec7405f012 100644 (file)
--- a/src/plugins/clamd/Makefile.am
+++ b/src/plugins/clamd/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 SUBDIRS = libclamd
 plugindir = $(pkglibdir)/plugins

diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 96389cf112bb8fc58dae8e423b52ae7c74c8a22f..85e0663dab07f2611fa9ad78df8298b488e47967 100644 (file)
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am
index cba9e5388e0b4c2ad5574e38d025a7e5c0417e7f..14be11fc7177bf692f17349ef94fc42290d4d6d4 100644 (file)
--- a/src/plugins/fetchinfo/Makefile.am
+++ b/src/plugins/fetchinfo/Makefile.am
@@ -81,4 +81,4 @@ fetchinfo_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)

diff --git a/src/plugins/gdata/Makefile.am b/src/plugins/gdata/Makefile.am
index 4632af55b96f2cde9be17a62f10eefd0e0016428..e80cebccd6108bdf31c24fe6bd2d66fd8d27f915 100644 (file)
--- a/src/plugins/gdata/Makefile.am
+++ b/src/plugins/gdata/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 

diff --git a/src/plugins/geolocation/Makefile.am b/src/plugins/geolocation/Makefile.am
index 47ffab5fde39da90eb148cf2dc99511dbfaacc34..d43cc280481788f805ecd31e8875e1b91dbd53d7 100644 (file)
--- a/src/plugins/geolocation/Makefile.am
+++ b/src/plugins/geolocation/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 

diff --git a/src/plugins/libravatar/Makefile.am b/src/plugins/libravatar/Makefile.am
index 19d38edeeec1324cc799d6e874fec59256ab56ad..022b07e389b2416418bbd4ec3642cef70fa41afa 100644 (file)
--- a/src/plugins/libravatar/Makefile.am
+++ b/src/plugins/libravatar/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index 20608bcc622bc4638baf3307757c656185123ce8..9703286c372684908e447213ffb5d6ad0ae15612 100644 (file)
--- a/src/plugins/mailmbox/Makefile.am
+++ b/src/plugins/mailmbox/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/newmail/Makefile.am b/src/plugins/newmail/Makefile.am
index 8d363c0f3d9199b7dac88e003b9088ec97e294d5..9554f85fa6646336573be6e8bc74870a78a9d1ef 100644 (file)
--- a/src/plugins/newmail/Makefile.am
+++ b/src/plugins/newmail/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 

diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index d7d1d341930a71ea2bb54db0ae4f514ba7c6c60a..186ed0343554cea80c0482f7830c574ca3ab860e 100644 (file)
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -17,7 +17,7 @@ hotkey_lib_path =
 endif
 
 SUBDIRS=gtkhotkey
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 CFLAGS += "-Wall"
 
 IFLAGS = \

diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index 44ab32fb5ddfcfa58d65609fdca02f4a233b3806..aa9edf4eb4b2dcbc3cecafddfbbe7c8e3ec859b6 100644 (file)
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 plugindir = $(pkglibdir)/plugins
 

diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
index bee013dba565426c85799b72afb229c5669484e1..30d984d8667d26a72906311a7428c8d7f571a767 100644 (file)
--- a/src/plugins/perl/Makefile.am
+++ b/src/plugins/perl/Makefile.am
@@ -36,5 +36,5 @@ perl_la_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(PERL_CFLAGS)
 
-EXTRA_DIST = cm_perl.pod $(appdata_in_files)
+EXTRA_DIST = cm_perl.pod $(appdata_DATA)
 

diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
index a3a51d1fbf6464ee92077190367193c8fb56cb9e..19f5fea4132ff2c35630cb8aa1209418323d168f 100644 (file)
--- a/src/plugins/pgpcore/Makefile.am
+++ b/src/plugins/pgpcore/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = version.rc plugin.def claws.def $(appdata_in_files)
+EXTRA_DIST = version.rc plugin.def claws.def $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am
index 17a02782acece3d6881ad3ceef27493f4d0a8e77..157d64db1a2068f42da1e7620b00a2d644559c9a 100644 (file)
--- a/src/plugins/pgpinline/Makefile.am
+++ b/src/plugins/pgpinline/Makefile.am
@@ -9,7 +9,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpinline.deps \
-       $(appdata_in_files)
+       $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
index 22358bd67fa26334ac5f487cff273a643f734970..c1363d29cfd9efaacb3c07eb6c6f8ef65ecdbbd3 100644 (file)
--- a/src/plugins/pgpmime/Makefile.am
+++ b/src/plugins/pgpmime/Makefile.am
@@ -9,7 +9,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpmime.deps \
-       $(appdata_in_files)
+       $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index 800e8998b658f7669b4468fe09e45b393030e9f5..1ed4cbf61c5104a832d9aab894923c653e8d3773 100644 (file)
--- a/src/plugins/python/Makefile.am
+++ b/src/plugins/python/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = $(appdata_DATA)
 
 SUBDIRS = examples
 

diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index 7ca8a743073c60603f42717192f680da144fc03b..ffc66c3276961157f746135475c24628f1dcf6f2 100644 (file)
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am
index 2b7a2a946373e9ab33703ddd84a3a5b992f35623..eea8c2274e0cecc2c6223b9297cabe98759d916c 100644 (file)
--- a/src/plugins/smime/Makefile.am
+++ b/src/plugins/smime/Makefile.am
@@ -9,7 +9,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def smime.deps \
-       $(appdata_in_files)
+       $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index 923f105b8b8c0488cfb20b8bd595c8937df1384d..5b86474ef5d87a31004b21cb88e00266a862aedd 100644 (file)
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \

diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
index cbb56c84dc8ff44a120d30841b2c9d6d3f44c065..5a7c985d548edc17b00e89be820cbde011bf7937 100644 (file)
--- a/src/plugins/spamassassin/Makefile.am
+++ b/src/plugins/spamassassin/Makefile.am
@@ -40,4 +40,4 @@ spamassassin_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)
 
-EXTRA_DIST = README $(appdata_in_files)
+EXTRA_DIST = README $(appdata_DATA)

diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
index 40fe3fe54046ff5b3fa444d00626f263dec93993..2e2226e5ce210d34c1cc6d3b7856da6d15394301 100644 (file)
--- a/src/plugins/tnef_parse/Makefile.am
+++ b/src/plugins/tnef_parse/Makefile.am
@@ -8,7 +8,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 if OS_WIN32
 

diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
index b978ebfbdb84481c27345f13ca01033093a271fd..fd6a4f1710e3d2256dd4535657e93fb8fdef0994 100644 (file)
--- a/src/plugins/vcalendar/Makefile.am
+++ b/src/plugins/vcalendar/Makefile.am
@@ -9,7 +9,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 SUBDIRS = libical
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA)
 
 IFLAGS = \
        -I$(top_srcdir)/src \