[ekiga] Fix previous commit on AppData, sorry

[Eugen Dedu <ededu src gnome org>]

commit b304ee9f70d99f7bdbc086de920054c142c9d1f0
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date:   Fri Jan 30 19:28:38 2015 +0100

    Fix previous commit on AppData, sorry

 Makefile.am     |   26 +++++++++++++++-----------
 src/Makefile.am |    7 -------
 2 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index bebb853..e2e3078 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS += help
 endif
 
 
-### Intltool on the desktop and on the schemas files
+### Intltool on the desktop, schemas and appdata files
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 
@@ -23,6 +23,11 @@ convert_DATA = @PACKAGE_NAME  convert
 
 @GSETTINGS_RULES@
 
+appdatadir = $(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_in_files = ekiga.appdata.xml.in
+ INTLTOOL_XML_RULE@
+
 
 ### Win32 files
 WIN32_DIST = \
@@ -57,15 +62,14 @@ WIN32_DIST = \
 
 ### Extra dist
 EXTRA_DIST = \
-       $(DESKTOP_FILE)                                         \
-        doc/using_dbus.html                                     \
-       gnome-doc-utils.make                                    \
-       FAQ                                                     \
-       README                                                  \
-        LICENSE                                                 \
-        MAINTAINERS                                             \
-       $(gsettings_SCHEMAS)                                    \
-       $(SCHEMAS_FILE)                                         \
+       $(appdata_in_files)             \
+       $(DESKTOP_FILE)                 \
+       doc/using_dbus.html             \
+       gnome-doc-utils.make    \
+       README                                  \
+       LICENSE                     \
+       $(gsettings_SCHEMAS)    \
+       $(SCHEMAS_FILE)                 \
        $(WIN32_DIST)
 
 Applicationsdir = $(datadir)/applications
@@ -88,7 +92,7 @@ revision.h:
         fi
 
 ### Dist Clear
-DISTCLEANFILES=gnome-doc-utils.make ekiga.desktop org.gnome.ekiga.gschema revision.h
+DISTCLEANFILES=gnome-doc-utils.make ekiga.desktop org.gnome.ekiga.gschema revision.h $(appdata_DATA)
 
 MAINTAINERCLEANFILES= \
        Makefile.in aclocal.m4 compile config.guess config.sub \
diff --git a/src/Makefile.am b/src/Makefile.am
index 02f0599..4428924 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -117,20 +117,13 @@ AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOO
 ekiga_LDADD = \
        $(top_builddir)/lib/libekiga.la $(AM_LIBS)
 
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = ekiga.appdata.xml.in
- INTLTOOL_XML_RULE@
-
 EXTRA_DIST = \
-       $(appdata_in_files)             \
        $(service_in_files)             \
        dbus-helper/dbus-stub.xml       \
        dbus-helper/dbus-helper-stub.xml \
        ekiga-debug-analyser
 
 CLEANFILES = \
-       $(appdata_DATA)                 \
        $(service_DATA)         \
        build-subdir-stamp      \
        $(BUILT_SOURCES)