aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-11-15 15:58:59 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-11-15 15:58:59 +0800
commitc9721056606b7d03de34eabcf8ad17acac52cab3 (patch)
tree428d3341ad7747d47f8244291cb254bf7c59a258
parentd2547bd7ce8081047d7b1f3259054ffbfa69d104 (diff)
downloadgsoc2013-empathy-c9721056606b7d03de34eabcf8ad17acac52cab3.tar
gsoc2013-empathy-c9721056606b7d03de34eabcf8ad17acac52cab3.tar.gz
gsoc2013-empathy-c9721056606b7d03de34eabcf8ad17acac52cab3.tar.bz2
gsoc2013-empathy-c9721056606b7d03de34eabcf8ad17acac52cab3.tar.lz
gsoc2013-empathy-c9721056606b7d03de34eabcf8ad17acac52cab3.tar.xz
gsoc2013-empathy-c9721056606b7d03de34eabcf8ad17acac52cab3.tar.zst
gsoc2013-empathy-c9721056606b7d03de34eabcf8ad17acac52cab3.zip
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
-rw-r--r--ChangeLog5
-rw-r--r--src/Makefile.am20
2 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ec015bf3..7d659bf6f 100644
--- 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 ede2b2a01..c8c6875d7 100644
--- 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
+