roster-window: fix crash if empathy_chatroom_manager_find() failed

[empathy.git] / data / Makefile.am

diff --git a/data/Makefile.am b/data/Makefile.am
index a2be750cfe7f0cc76fecbfbf942de4c81885a9af..14b8be7dcfa42d2af001a7d42ca843540c125a7e 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,18 +1,13 @@
-SUBDIRS = icons
+SUBDIRS = icons themes
 
 desktopdir = $(datadir)/applications
 desktop_in_files = \
        empathy.desktop.in \
-       empathy-accounts.desktop.in \
        $(NULL)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-gsettings_files = \
-       org.gnome.Empathy.gschema.xml.in \
-       $(NULL)
-gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml)
-@INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.Empathy.gschema.xml
 @GSETTINGS_RULES@
 
 # We need to compile schemas at make time
@@ -33,19 +28,11 @@ servicefile_in_files = \
        org.freedesktop.Telepathy.Client.Empathy.Call.service.in \
        org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service.in
 
-if HAVE_EMPATHY_AV
-servicefile_in_files += \
-       org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in
-endif
-
 servicefile_DATA = $(servicefile_in_files:.service.in=.service)
 
 org.freedesktop.Telepathy.Client.Empathy.Chat.service: org.freedesktop.Telepathy.Client.Empathy.Chat.service.in
        $(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
 
-org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service: org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in
-       $(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
-
 org.freedesktop.Telepathy.Client.Empathy.Auth.service: org.freedesktop.Telepathy.Client.Empathy.Auth.service.in
        $(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
 
@@ -62,18 +49,24 @@ clientfile_DATA = \
        Empathy.Call.client \
        Empathy.FileTransfer.client
 
-if HAVE_EMPATHY_AV
-clientfile_DATA += \
-       Empathy.AudioVideo.client
-endif
-
 htmldir = $(datadir)/empathy
 html_DATA = \
        Template.html \
        empathy-log-window.html \
        $(NULL)
 
+cssdir = $(datadir)/empathy
+css_DATA = \
+       empathy.css \
+       $(NULL)
+
+appdatadir = $(datadir)/appdata
+appdata_in_files = empathy.appdata.xml.in
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+@INTLTOOL_XML_RULE@
+
 EXTRA_DIST =                           \
+       $(appdata_in_files)             \
        $(convert_DATA)                 \
        $(desktop_in_files)             \
        $(desktop_DATA)                 \
@@ -81,13 +74,17 @@ EXTRA_DIST =                                \
        $(html_DATA)                    \
        $(clientfile_DATA)              \
        $(servicefile_in_files)         \
-       $(gsettings_files)              \
+       $(gsettings_SCHEMAS)            \
+       $(css_DATA)                     \
        $(NULL)
+CLEANFILES = \
+       $(appdata_DATA)
+
 
 DISTCLEANFILES =               \
        $(desktop_DATA)         \
        $(schemas_DATA)         \
        $(servicefile_DATA)     \
-       $(gsettings_SCHEMAS)    \
+       $(css_DATA)             \
        gschemas.compiled       \
        $(NULL)