Do not build voip chandler if building without voip support. Fixes bug

2007-11-15  Xavier Claessens  <xclaesse@gmail.com>

	* src/Makefile.am: Do not build voip chandler if building without voip
	support. Fixes bug #496861.

svn path=/trunk/; revision=438

diff --git a/ChangeLog b/ChangeLog
index 2ec015bf3932267a66aa5299ec108fa2d5495c70..7d659bf6f7fd86e66f97ecc4f0cdc5d74b05a764 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-15  Xavier Claessens  <xclaesse@gmail.com>
+
+       * src/Makefile.am: Do not build voip chandler if building without voip
+       support. Fixes bug #496861.
+
 2007-11-13  Xavier Claessens  <xclaesse@gmail.com>
 
        * libempathy/empathy-chandler.c:

diff --git a/src/Makefile.am b/src/Makefile.am
index ede2b2a014b81ff68fcef4699a189b1e9f947289..c8c6875d7b55ef3bdce3721c5c1361d110044ed6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,19 +19,17 @@ bin_PROGRAMS =                      \
        empathy-accounts
 
 libexec_PROGRAMS =             \
-       empathy-call-chandler   \
        empathy-chat-chandler
 
 empathy_SOURCES = empathy.c
 empathy_accounts_SOURCES = empathy-accounts.c
-empathy_call_chandler_SOURCES = empathy-call-chandler.c
 empathy_chat_chandler_SOURCES = empathy-chat-chandler.c
 
 # Dbus service files
 servicedir = $(datadir)/dbus-1/services
 service_DATA =                                                 \
-       org.gnome.Empathy.Chat.service                          \
-       org.gnome.Empathy.Call.service
+       org.gnome.Empathy.Chat.service
+
 %.service: %.service.in Makefile
        @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
@@ -39,13 +37,8 @@ chandlerdir = $(datadir)/telepathy/managers
 chandler_DATA =                                                        \
        empathy-chat.chandler
 
-if HAVE_VOIP
-chandler_DATA += empathy-call.chandler
-endif
-
 BUILT_SOURCES =                                                        \
-       org.gnome.Empathy.Chat.service                          \
-       org.gnome.Empathy.Call.service
+       $(service_DATA)
 
 EXTRA_DIST =                                                   \
        org.gnome.Empathy.Chat.service.in                       \
@@ -55,3 +48,10 @@ EXTRA_DIST =                                                 \
 
 CLEANFILES = $(BUILT_SOURCES)
 
+if HAVE_VOIP
+libexec_PROGRAMS += empathy-call-chandler
+empathy_call_chandler_SOURCES = empathy-call-chandler.c
+service_DATA +=        org.gnome.Empathy.Call.service
+chandler_DATA += empathy-call.chandler
+endif
+