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

diff --git a/data/Makefile.am b/data/Makefile.am
index d7e416a8..a2be750c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,20 +15,28 @@ 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
 
-streamingprefsdir =  $(datadir)/empathy
-streamingprefs_DATA =		\
-	codec-preferences	\
-	element-properties
-
 servicefiledir = $(datadir)/dbus-1/services
 servicefile_in_files = \
 	org.freedesktop.Telepathy.Client.Empathy.Chat.service.in \
-	org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in \
-	org.freedesktop.Telepathy.Client.Empathy.Auth.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
 
 servicefile_DATA = $(servicefile_in_files:.service.in=.service)
 
@@ -41,21 +49,35 @@ org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service: org.freedesktop.Tel
 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.AudioVideo.client \
-	Empathy.Auth.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
+html_DATA = \
+	Template.html \
+	empathy-log-window.html \
+	$(NULL)
 
 EXTRA_DIST = 				\
 	$(convert_DATA)			\
 	$(desktop_in_files)		\
 	$(desktop_DATA)			\
 	$(schemas_DATA)			\
-	$(streamingprefs_DATA)		\
 	$(html_DATA)			\
 	$(clientfile_DATA)		\
 	$(servicefile_in_files)		\
@@ -67,4 +89,5 @@ DISTCLEANFILES = 		\
 	$(schemas_DATA)		\
 	$(servicefile_DATA)	\
 	$(gsettings_SCHEMAS)	\
+	gschemas.compiled	\
 	$(NULL)