Fix typo in var name and don't link empathy-call-chandler on libemp-extensions.la...

[empathy.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 36161fb784b8a6eaa5127969044f608b72ba4ec5..59d6c5c1ffbeac7748e57ac79cf628de6fa31024 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,31 +17,30 @@ LDADD =                                                             \
 bin_PROGRAMS =                 \
        empathy                 \
        empathy-accounts        \
-       empathy-call-chandler
+       empathy-logs
+
+libexec_PROGRAMS =             \
+       empathy-chat-chandler
 
 empathy_SOURCES = empathy.c
 empathy_accounts_SOURCES = empathy-accounts.c
-empathy_call_chandler_SOURCES = empathy-call-chandler.c
+empathy_logs_SOURCES = empathy-logs.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|\@bindir\@|$(bindir)|" $< > $@
+       @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 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                       \
@@ -51,3 +50,12 @@ 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
+else
+EXTRA_DIST += empathy-call.chandler
+endif
+