add configure option --enable-appdata and put all appdata in appdata/
authorPaul <paul@claws-mail.org>
Wed, 18 Jun 2014 10:19:07 +0000 (11:19 +0100)
committerPaul <paul@claws-mail.org>
Wed, 18 Jun 2014 10:19:07 +0000 (11:19 +0100)
61 files changed:
Makefile.am
appdata/Makefile.am [new file with mode: 0644]
appdata/claws-mail-acpi_notifier.metainfo.xml.in [moved from src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml.in with 83% similarity]
appdata/claws-mail-address_keeper.metainfo.xml.in [moved from src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml.in with 84% similarity]
appdata/claws-mail-archive.metainfo.xml.in [moved from src/plugins/archive/claws-mail-archive.metainfo.xml.in with 82% similarity]
appdata/claws-mail-att_remover.metainfo.xml.in [moved from src/plugins/att_remover/claws-mail-att_remover.metainfo.xml.in with 82% similarity]
appdata/claws-mail-attachwarner.metainfo.xml.in [moved from src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml.in with 85% similarity]
appdata/claws-mail-bogofilter.metainfo.xml.in [moved from src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml.in with 84% similarity]
appdata/claws-mail-bsfilter.metainfo.xml.in [moved from src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml.in with 84% similarity]
appdata/claws-mail-clamd.metainfo.xml.in [moved from src/plugins/clamd/claws-mail-clamd.metainfo.xml.in with 84% similarity]
appdata/claws-mail-fancy.metainfo.xml.in [moved from src/plugins/fancy/claws-mail-fancy.metainfo.xml.in with 82% similarity]
appdata/claws-mail-fetchinfo.metainfo.xml.in [moved from src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml.in with 84% similarity]
appdata/claws-mail-gdata.metainfo.xml.in [moved from src/plugins/gdata/claws-mail-gdata.metainfo.xml.in with 82% similarity]
appdata/claws-mail-geolocation.metainfo.xml.in [moved from src/plugins/geolocation/claws-mail-geolocation.metainfo.xml.in with 82% similarity]
appdata/claws-mail-libravatar.metainfo.xml.in [moved from src/plugins/libravatar/claws-mail-libravatar.metainfo.xml.in with 84% similarity]
appdata/claws-mail-mailmbox.metainfo.xml.in [moved from src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml.in with 82% similarity]
appdata/claws-mail-newmail.metainfo.xml.in [moved from src/plugins/newmail/claws-mail-newmail.metainfo.xml.in with 83% similarity]
appdata/claws-mail-notification.metainfo.xml.in [moved from src/plugins/notification/claws-mail-notification.metainfo.xml.in with 84% similarity]
appdata/claws-mail-pdf_viewer.metainfo.xml.in [moved from src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml.in with 84% similarity]
appdata/claws-mail-perl.metainfo.xml.in [moved from src/plugins/perl/claws-mail-perl.metainfo.xml.in with 82% similarity]
appdata/claws-mail-pgpcore.metainfo.xml.in [moved from src/plugins/pgpcore/claws-mail-pgpcore.metainfo.xml.in with 100% similarity]
appdata/claws-mail-pgpinline.metainfo.xml.in [moved from src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml.in with 83% similarity]
appdata/claws-mail-pgpmime.metainfo.xml.in [moved from src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml.in with 83% similarity]
appdata/claws-mail-python.metainfo.xml.in [moved from src/plugins/python/claws-mail-python.metainfo.xml.in with 84% similarity]
appdata/claws-mail-rssyl.metainfo.xml.in [moved from src/plugins/rssyl/claws-mail-rssyl.metainfo.xml.in with 82% similarity]
appdata/claws-mail-smime.metainfo.xml.in [moved from src/plugins/smime/claws-mail-smime.metainfo.xml.in with 82% similarity]
appdata/claws-mail-spam_report.metainfo.xml.in [moved from src/plugins/spam_report/claws-mail-spam_report.metainfo.xml.in with 82% similarity]
appdata/claws-mail-spamassassin.metainfo.xml.in [moved from src/plugins/spamassassin/claws-mail-spamassassin.metainfo.xml.in with 85% similarity]
appdata/claws-mail-tnef_parse.metainfo.xml.in [moved from src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml.in with 83% similarity]
appdata/claws-mail-vcalendar.metainfo.xml.in [moved from src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml.in with 84% similarity]
appdata/claws-mail.appdata.xml.in [moved from claws-mail.appdata.xml.in with 100% similarity]
configure.ac
po/POTFILES.in
src/plugins/acpi_notifier/Makefile.am
src/plugins/address_keeper/Makefile.am
src/plugins/archive/Makefile.am
src/plugins/att_remover/Makefile.am
src/plugins/attachwarner/Makefile.am
src/plugins/bogofilter/Makefile.am
src/plugins/bsfilter/Makefile.am
src/plugins/clamd/Makefile.am
src/plugins/fancy/Makefile.am
src/plugins/fetchinfo/Makefile.am
src/plugins/gdata/Makefile.am
src/plugins/geolocation/Makefile.am
src/plugins/libravatar/Makefile.am
src/plugins/mailmbox/Makefile.am
src/plugins/newmail/Makefile.am
src/plugins/notification/Makefile.am
src/plugins/pdf_viewer/Makefile.am
src/plugins/perl/Makefile.am
src/plugins/pgpcore/Makefile.am
src/plugins/pgpinline/Makefile.am
src/plugins/pgpmime/Makefile.am
src/plugins/python/Makefile.am
src/plugins/rssyl/Makefile.am
src/plugins/smime/Makefile.am
src/plugins/spam_report/Makefile.am
src/plugins/spamassassin/Makefile.am
src/plugins/tnef_parse/Makefile.am
src/plugins/vcalendar/Makefile.am

index ee4ffbd..9065980 100644 (file)
@@ -6,6 +6,10 @@ ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2 dist-xz
 
 SUBDIRS = m4 po src tools config doc manual
+if BUILD_APPDATA
+SUBDIRS += appdata
+endif
+DIST_SUBDIRS = appdata $(SUBDIRS)
 
 # when changing the name or location of the .desktop file,
 # also update src/common/Makefile.am
@@ -15,12 +19,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
-appdata_in_files = claws-mail.appdata.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
 EXTRA_DIST = \
        ChangeLog \
        ChangeLog.gtk1 \
@@ -33,8 +31,6 @@ EXTRA_DIST = \
        claws-mail.pc.in \
        $(desktop_in_files) \
        claws-mail.png \
-       $(appdata_DATA) \
-       $(appdata_in_files) \
        autogen.sh \
        claws-features.h.in \
        version
diff --git a/appdata/Makefile.am b/appdata/Makefile.am
new file mode 100644 (file)
index 0000000..c89e44e
--- /dev/null
@@ -0,0 +1,41 @@
+ # Makefile.am for "appdata" directory
+# This file is part of Claws Mail package.
+# See COPYING file for license details.
+
+@INTLTOOL_XML_RULE@
+
+appdata_in_files = claws-mail.appdata.xml.in \
+       claws-mail-acpi_notifier.metainfo.xml.in \
+       claws-mail-address_keeper.metainfo.xml.in \
+       claws-mail-archive.metainfo.xml.in \
+       claws-mail-att_remover.metainfo.xml.in \
+       claws-mail-attachwarner.metainfo.xml.in \
+       claws-mail-bogofilter.metainfo.xml.in \
+       claws-mail-bsfilter.metainfo.xml.in \
+       claws-mail-clamd.metainfo.xml.in \
+       claws-mail-fancy.metainfo.xml.in \
+       claws-mail-fetchinfo.metainfo.xml.in \
+       claws-mail-gdata.metainfo.xml.in \
+       claws-mail-geolocation.metainfo.xml.in \
+       claws-mail-libravatar.metainfo.xml.in \
+       claws-mail-mailmbox.metainfo.xml.in \
+       claws-mail-newmail.metainfo.xml.in \
+       claws-mail-notification.metainfo.xml.in \
+       claws-mail-pdf_viewer.metainfo.xml.in \
+       claws-mail-perl.metainfo.xml.in \
+       claws-mail-pgpcore.metainfo.xml.in \
+       claws-mail-pgpinline.metainfo.xml.in \
+       claws-mail-pgpmime.metainfo.xml.in \
+       claws-mail-python.metainfo.xml.in \
+       claws-mail-rssyl.metainfo.xml.in \
+       claws-mail-smime.metainfo.xml.in \
+       claws-mail-spam_report.metainfo.xml.in \
+       claws-mail-spamassassin.metainfo.xml.in \
+       claws-mail-tnef_parse.metainfo.xml.in \
+       claws-mail-vcalendar.metainfo.xml.in
+
+appdatadir=$(datarootdir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
+EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
+
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-acpi_notifier</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-address_keeper</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-archive</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-att_remover</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-attachwarner</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-bogofilter</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-bsfilter</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-clamd</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-fancy</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-fetchinfo</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-gdata</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-geolocation</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-libravatar</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-mailmbox</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-newmail</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-notification</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-pdf_viewer</id>
 <extends>claws-mail.desktop</extends>
similarity index 82%
rename from src/plugins/perl/claws-mail-perl.metainfo.xml.in
rename to appdata/claws-mail-perl.metainfo.xml.in
index ea43683..69afa3d 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-perl</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-pgpinline</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-pgpmime</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-python</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-rssyl</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-smime</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-spam_report</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-spamassassin</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-tnef_parse</id>
 <extends>claws-mail.desktop</extends>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 the Claws Mail team and Igor Gnatenko <i.gnatenko.brain@gmail.com> -->
+<!-- Copyright 2014 the Claws Mail team -->
 <component type="addon">
 <id>claws-mail-vcalendar</id>
 <extends>claws-mail.desktop</extends>
index 612b555..1cc5e25 100644 (file)
@@ -904,6 +904,19 @@ else
 fi
 AM_CONDITIONAL(CLAWS_VALGRIND, test x"$enable_valgrind" = x"yes")
 
+dnl disabled by default
+AC_ARG_ENABLE(appdata,
+               [  --enable-appdata             Build appdata],
+               [enable_appdata=$enableval], [enable_appdata=no])
+
+AC_MSG_CHECKING([whether to build appdata])
+if test x"$enable_appdata" != xno; then
+       AC_MSG_RESULT(yes)
+else
+       AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(BUILD_APPDATA, test x"$enable_appdata" = x"yes")
+
 dnl *************************
 dnl ** section for plugins **
 dnl *************************
@@ -1892,6 +1905,7 @@ dnl ****************************
 
 AC_OUTPUT([
 Makefile
+appdata/Makefile
 m4/Makefile
 po/Makefile.in
 src/common/version.h
@@ -2002,6 +2016,7 @@ echo "DBUS               : $enable_dbus"
 echo "NetworkManager     : $enable_networkmanager"
 echo "Manual             : $enable_manual"
 echo "Generic UMPC code  : $enable_generic_umpc"
+echo "AppData            : $enable_appdata"
 echo "Config dir         : $ac_cv_with_config_dir"
 
 echo "Plugins"
index af7da4a..1f3a396 100644 (file)
@@ -1,5 +1,33 @@
-claws-mail.appdata.xml.in
 claws-mail.desktop.in
+appdata/claws-mail.appdata.xml.in
+appdata/claws-mail-acpi_notifier.metainfo.xml.in
+appdata/claws-mail-address_keeper.metainfo.xml.in
+appdata/claws-mail-archive.metainfo.xml.in
+appdata/claws-mail-att_remover.metainfo.xml.in
+appdata/claws-mail-attachwarner.metainfo.xml.in
+appdata/claws-mail-bogofilter.metainfo.xml.in
+appdata/claws-mail-bsfilter.metainfo.xml.in
+appdata/claws-mail-clamd.metainfo.xml.in
+appdata/claws-mail-fancy.metainfo.xml.in
+appdata/claws-mail-fetchinfo.metainfo.xml.in
+appdata/claws-mail-gdata.metainfo.xml.in
+appdata/claws-mail-geolocation.metainfo.xml.in
+appdata/claws-mail-libravatar.metainfo.xml.in
+appdata/claws-mail-mailmbox.metainfo.xml.in
+appdata/claws-mail-newmail.metainfo.xml.in
+appdata/claws-mail-notification.metainfo.xml.in
+appdata/claws-mail-pdf_viewer.metainfo.xml.in
+appdata/claws-mail-perl.metainfo.xml.in
+appdata/claws-mail-pgpcore.metainfo.xml.in
+appdata/claws-mail-pgpinline.metainfo.xml.in
+appdata/claws-mail-pgpmime.metainfo.xml.in
+appdata/claws-mail-python.metainfo.xml.in
+appdata/claws-mail-rssyl.metainfo.xml.in
+appdata/claws-mail-smime.metainfo.xml.in
+appdata/claws-mail-spam_report.metainfo.xml.in
+appdata/claws-mail-spamassassin.metainfo.xml.in
+appdata/claws-mail-tnef_parse.metainfo.xml.in
+appdata/claws-mail-vcalendar.metainfo.xml.in
 src/account.c
 src/action.c
 src/addrclip.c
@@ -88,53 +116,37 @@ src/mimeview.c
 src/news.c
 src/news_gtk.c
 src/plugins/acpi_notifier/acpi_notifier.c
-src/plugins/acpi_notifier/claws-mail-acpi_notifier.metainfo.xml.in
 src/plugins/address_keeper/address_keeper.c
 src/plugins/address_keeper/address_keeper.h
 src/plugins/address_keeper/address_keeper_prefs.c
-src/plugins/address_keeper/claws-mail-address_keeper.metainfo.xml.in
 src/plugins/archive/archiver.c
 src/plugins/archive/archiver_gtk.c
 src/plugins/archive/archiver_prefs.c
-src/plugins/archive/claws-mail-archive.metainfo.xml.in
 src/plugins/att_remover/att_remover.c
-src/plugins/att_remover/claws-mail-att_remover.metainfo.xml.in
 src/plugins/attachwarner/attachwarner.c
 src/plugins/attachwarner/attachwarner_prefs.c
-src/plugins/attachwarner/claws-mail-attachwarner.metainfo.xml.in
 src/plugins/bogofilter/bogofilter.c
 src/plugins/bogofilter/bogofilter_gtk.c
-src/plugins/bogofilter/claws-mail-bogofilter.metainfo.xml.in
 src/plugins/bsfilter/bsfilter.c
 src/plugins/bsfilter/bsfilter_gtk.c
-src/plugins/bsfilter/claws-mail-bsfilter.metainfo.xml.in
 src/plugins/clamd/clamav_plugin.c
 src/plugins/clamd/clamav_plugin_gtk.c
-src/plugins/clamd/claws-mail-clamd.metainfo.xml.in
 src/plugins/clamd/libclamd/clamd-plugin.c
 src/plugins/demo/demo.c
-src/plugins/fancy/claws-mail-fancy.metainfo.xml.in
 src/plugins/fancy/fancy_prefs.c
 src/plugins/fancy/fancy_viewer.c
-src/plugins/fetchinfo/claws-mail-fetchinfo.metainfo.xml.in
 src/plugins/fetchinfo/fetchinfo_plugin.c
 src/plugins/fetchinfo/fetchinfo_plugin_gtk.c
-src/plugins/gdata/claws-mail-gdata.metainfo.xml.in
 src/plugins/gdata/cm_gdata_contacts.c
 src/plugins/gdata/cm_gdata_prefs.c
 src/plugins/gdata/gdata_plugin.c
-src/plugins/geolocation/claws-mail-geolocation.metainfo.xml.in
 src/plugins/geolocation/geolocation_plugin.c
-src/plugins/libravatar/claws-mail-libravatar.metainfo.xml.in
 src/plugins/libravatar/libravatar.c
 src/plugins/libravatar/libravatar_prefs.c
-src/plugins/mailmbox/claws-mail-mailmbox.metainfo.xml.in
 src/plugins/mailmbox/mailmbox_folder.c
 src/plugins/mailmbox/plugin.c
 src/plugins/mailmbox/plugin_gtk.c
-src/plugins/newmail/claws-mail-newmail.metainfo.xml.in
 src/plugins/newmail/newmail.c
-src/plugins/notification/claws-mail-notification.metainfo.xml.in
 src/plugins/notification/notification_banner.c
 src/plugins/notification/notification_foldercheck.c
 src/plugins/notification/notification_lcdproc.c
@@ -142,28 +154,21 @@ src/plugins/notification/notification_plugin.c
 src/plugins/notification/notification_popup.c
 src/plugins/notification/notification_prefs.c
 src/plugins/notification/notification_trayicon.c
-src/plugins/pdf_viewer/claws-mail-pdf_viewer.metainfo.xml.in
 src/plugins/pdf_viewer/poppler_viewer.c
-src/plugins/perl/claws-mail-perl.metainfo.xml.in
 src/plugins/perl/perl_gtk.c
 src/plugins/pgpcore/autocompletion.c
-src/plugins/pgpcore/claws-mail-pgpcore.metainfo.xml.in
 src/plugins/pgpcore/passphrase.c
 src/plugins/pgpcore/pgp_viewer.c
 src/plugins/pgpcore/plugin.c
 src/plugins/pgpcore/prefs_gpg.c
 src/plugins/pgpcore/select-keys.c
 src/plugins/pgpcore/sgpgme.c
-src/plugins/pgpinline/claws-mail-pgpinline.metainfo.xml.in
 src/plugins/pgpinline/pgpinline.c
 src/plugins/pgpinline/plugin.c
-src/plugins/pgpmime/claws-mail-pgpmime.metainfo.xml.in
 src/plugins/pgpmime/pgpmime.c
 src/plugins/pgpmime/plugin.c
-src/plugins/python/claws-mail-python.metainfo.xml.in
 src/plugins/python/composewindowtype.c
 src/plugins/python/python_plugin.c
-src/plugins/rssyl/claws-mail-rssyl.metainfo.xml.in
 src/plugins/rssyl/old_feeds.c
 src/plugins/rssyl/opml_export.c
 src/plugins/rssyl/opml_import.c
@@ -182,18 +187,13 @@ src/plugins/rssyl/rssyl_subscribe_gtk.c
 src/plugins/rssyl/rssyl_update_comments.c
 src/plugins/rssyl/rssyl_update_feed.c
 src/plugins/rssyl/rssyl_update_format.c
-src/plugins/smime/claws-mail-smime.metainfo.xml.in
 src/plugins/smime/plugin.c
 src/plugins/smime/smime.c
-src/plugins/spam_report/claws-mail-spam_report.metainfo.xml.in
 src/plugins/spam_report/spam_report.c
 src/plugins/spam_report/spam_report_prefs.c
-src/plugins/spamassassin/claws-mail-spamassassin.metainfo.xml.in
 src/plugins/spamassassin/spamassassin.c
 src/plugins/spamassassin/spamassassin_gtk.c
-src/plugins/tnef_parse/claws-mail-tnef_parse.metainfo.xml.in
 src/plugins/tnef_parse/tnef_parse.c
-src/plugins/vcalendar/claws-mail-vcalendar.metainfo.xml.in
 src/plugins/vcalendar/common-views.c
 src/plugins/vcalendar/day-view.c
 src/plugins/vcalendar/month-view.c
index afa1f81..3d6b9a8 100644 (file)
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-acpi_notifier.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_ACPI_NOTIFIER_PLUGIN
index abec728..cb97455 100644 (file)
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-address_keeper.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index c614c22..a528197 100644 (file)
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 #
-appdata_in_files = claws-mail-archive.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_ARCHIVE_PLUGIN
index fc8cb81..5fdc037 100644 (file)
@@ -2,12 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-att_remover.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index 4a80f5f..5c892e2 100644 (file)
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-attachwarner.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index e0f6752..d6dec04 100644 (file)
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-bogofilter.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_BOGOFILTER_PLUGIN
index 77ef72d..260c5c9 100644 (file)
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-bsfilter.metainfo.xml.in
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index 88e5c35..b59c84e 100644 (file)
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-clamd.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-
 SUBDIRS = libclamd
 plugindir = $(pkglibdir)/plugins
 
index 20449ee..7591451 100644 (file)
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-fancy.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index 5c37bb1..5e9af51 100644 (file)
@@ -2,12 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-fetchinfo.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
 if OS_WIN32
 
 LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
@@ -81,4 +75,4 @@ fetchinfo_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)
 
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
index 9360848..f43e8d2 100644 (file)
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-gdata.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_GDATA_PLUGIN
index 06979ae..5306832 100644 (file)
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-geolocation.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_GEOLOCATION_PLUGIN
index 05bf4c3..1950bfd 100644 (file)
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-libravatar.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index f5a0581..46caaec 100644 (file)
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-mailmbox.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index e86f4e7..2653d4f 100644 (file)
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-newmail.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_NEWMAIL_PLUGIN
index 465eb80..a5a1969 100644 (file)
@@ -2,12 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-notification.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
 if BUILD_HOTKEYS
 hotkey_lib = libcmnpgtkhotkey.la
 hotkey_lib_path = $(top_builddir)/src/plugins/notification/gtkhotkey/libcmnpgtkhotkey.la
@@ -17,7 +11,7 @@ hotkey_lib_path =
 endif
 
 SUBDIRS=gtkhotkey
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 CFLAGS += "-Wall"
 
 IFLAGS = \
index 6b78fe9..3e8071c 100644 (file)
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-pdf_viewer.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_PDF_VIEWER_PLUGIN
index 9820aa8..21737ca 100644 (file)
@@ -2,12 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-perl.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
 SUBDIRS = tools
 
 plugindir = $(pkglibdir)/plugins
@@ -36,5 +30,5 @@ perl_la_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(PERL_CFLAGS)
 
-EXTRA_DIST = cm_perl.pod $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = cm_perl.pod
 
index 7bfbc6c..50abc80 100644 (file)
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-pgpcore.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = version.rc plugin.def claws.def $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = version.rc plugin.def claws.def
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index 6863acc..c639cf1 100644 (file)
@@ -2,14 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-pgpinline.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpinline.deps \
-       $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpinline.deps
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index 3d7c7b8..9c70cd1 100644 (file)
@@ -2,14 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-pgpmime.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpmime.deps \
-       $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpmime.deps
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index 45e5980..8af099c 100644 (file)
@@ -2,14 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-python.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(appdata_DATA) $(appdata_in_files)
-
 SUBDIRS = examples
 
 plugindir = $(pkglibdir)/plugins
index 949efd3..64417c9 100644 (file)
@@ -4,13 +4,7 @@
 
 SUBDIRS = libfeed
 
-appdata_in_files = claws-mail-rssyl.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index 3007449..177b61a 100644 (file)
@@ -2,14 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-smime.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def smime.deps \
-       $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def smime.deps
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index cdc15c9..bb3b3f5 100644 (file)
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-spam_report.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 IFLAGS = \
        -I$(top_srcdir)/src \
index 7260870..748b679 100644 (file)
@@ -2,12 +2,6 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-spamassassin.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
 plugindir = $(pkglibdir)/plugins
 
 if BUILD_SPAMASSASSIN_PLUGIN
@@ -40,4 +34,4 @@ spamassassin_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)
 
-EXTRA_DIST = README $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = README
index 2c41d0b..3784507 100644 (file)
@@ -2,13 +2,7 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-tnef_parse.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 if OS_WIN32
 
index 140036c..2c6806f 100644 (file)
@@ -2,14 +2,8 @@
 # This file is part of Claws Mail package.
 # See COPYING file for license details.
 
-appdata_in_files = claws-mail-vcalendar.metainfo.xml.in
-appdatadir=$(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-@INTLTOOL_XML_RULE@
-
 SUBDIRS = libical
-EXTRA_DIST = claws.def plugin.def version.rc $(appdata_DATA) $(appdata_in_files)
+EXTRA_DIST = claws.def plugin.def version.rc
 
 IFLAGS = \
        -I$(top_srcdir)/src \