[Telepathy-commits] [telepathy-salut/master] Properly add avahi olpc support to the avahi backend when compiling with olpc support

[Sjoerd Simons]

---
 src/Makefile.am |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 41a7d70..2eb24b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,17 +65,6 @@ if ENABLE_DBUS_TUBES
     salut-tubes-channel.c
 endif
 
-if ENABLE_OLPC
-  CORE_SOURCES +=                                       \
-    salut-olpc-activity.h                               \
-    salut-olpc-activity.c                               \
-    salut-avahi-olpc-activity.h                         \
-    salut-avahi-olpc-activity.c                         \
-    salut-olpc-activity-manager.h                       \
-    salut-olpc-activity-manager.c                       \
-    salut-avahi-olpc-activity-manager.h                 \
-    salut-avahi-olpc-activity-manager.c
-endif
 
 AVAHI_BACKEND_SOURCES = 				\
     salut-avahi-discovery-client.h                      \
@@ -91,6 +80,20 @@ AVAHI_BACKEND_SOURCES = 				\
     salut-avahi-self.h                                  \
     salut-avahi-self.c
 
+if ENABLE_OLPC
+  CORE_SOURCES +=                                       \
+    salut-olpc-activity.h                               \
+    salut-olpc-activity.c                               \
+    salut-olpc-activity-manager.h                       \
+    salut-olpc-activity-manager.c
+
+  AVAHI_BACKEND_SOURCES +=                              \
+    salut-avahi-olpc-activity-manager.h                 \
+    salut-avahi-olpc-activity-manager.c                 \
+    salut-avahi-olpc-activity.h                         \
+    salut-avahi-olpc-activity.c
+endif
+
 DUMMY_BACKEND_SOURCES = 				\
     salut-dummy-discovery-client.h                      \
     salut-dummy-discovery-client.c
-- 
1.5.6.3