X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=data%2FMakefile.am;h=a2be750cfe7f0cc76fecbfbf942de4c81885a9af;hp=964abc78e9f62e5841ec4cfe7950c11b967fe5df;hb=aeab15ec37370f3c3aa8b4e1a4aec480109a6803;hpb=cc996612801193a05bde002c2535f7ab2ed93d20

diff --git a/data/Makefile.am b/data/Makefile.am
index 964abc78..a2be750c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,58 +1,93 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
-
-profiledir = $(datadir)/mission-control/profiles
-profile_DATA = 				\
-	jabber.profile			\
-	gtalk.profile			\
-	salut.profile			\
-	irc.profile			\
-	msn.profile			\
-	sofiasip.profile		\
-	aim.profile
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = empathy.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+SUBDIRS = icons
+
+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@
 
-schemasdir	 = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = empathy.schemas.in
-schemas_DATA 	 = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-	  for p in $(schemas_DATA) ; do \
-	    GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-	  done \
-	fi
-else
-install-data-local:
+gsettings_files = \
+	org.gnome.Empathy.gschema.xml.in \
+	$(NULL)
+gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml)
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
+
+# We need to compile schemas at make time
+# to run from source tree
+gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
+	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
+
+all-local: gschemas.compiled
+
+convertdir = $(datarootdir)/GConf/gsettings
+convert_DATA = \
+	empathy.convert
+
+servicefiledir = $(datadir)/dbus-1/services
+servicefile_in_files = \
+	org.freedesktop.Telepathy.Client.Empathy.Chat.service.in \
+	org.freedesktop.Telepathy.Client.Empathy.Auth.service.in \
+	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
 
-EXTRA_DIST = 				\
-	$(image_DATA)			\
-	$(profile_DATA)			\
-	$(autostart_in_files)		\
-	$(autostart_DATA)		\
-	$(schemas_in_files)		\
-	$(schemas_DATA)
+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)|" $< > $@
 
-DISTCLEANFILES = 			\
-	$(autostart_DATA)		\
-	$(schemas_DATA)
+org.freedesktop.Telepathy.Client.Empathy.Auth.service: org.freedesktop.Telepathy.Client.Empathy.Auth.service.in
+	$(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
+
+org.freedesktop.Telepathy.Client.Empathy.Call.service: org.freedesktop.Telepathy.Client.Empathy.Call.service.in
+	$(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
+
+org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service: org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service.in
+	$(AM_V_GEN)sed -e "s|[@]bindir[@]|$(bindir)|" $< > $@
+
+clientfiledir = $(datarootdir)/telepathy/clients
+clientfile_DATA = \
+	Empathy.Chat.client \
+	Empathy.Auth.client \
+	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)
+
+EXTRA_DIST = 				\
+	$(convert_DATA)			\
+	$(desktop_in_files)		\
+	$(desktop_DATA)			\
+	$(schemas_DATA)			\
+	$(html_DATA)			\
+	$(clientfile_DATA)		\
+	$(servicefile_in_files)		\
+	$(gsettings_files)		\
+	$(NULL)
 
+DISTCLEANFILES = 		\
+	$(desktop_DATA)		\
+	$(schemas_DATA)		\
+	$(servicefile_DATA)	\
+	$(gsettings_SCHEMAS)	\
+	gschemas.compiled	\
+	$(NULL)