diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2008-08-20 17:41:04 +0100 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2008-08-20 17:41:04 +0100 |
| commit | 28c0ac5b51aa3694b0df8b0441771831f2ee52e2 (patch) | |
| tree | 1cdbee106fc5db77a1534a55945c4a96f11a316b | |
| parent | 2b2998bf6a7844e05f04e78b2ef462d44f3c0c60 (diff) | |
Properly add avahi olpc support to the avahi backend when compiling with olpc supporttelepathy-salut-0.3.4
| -rw-r--r-- | src/Makefile.am | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 41a7d700..2eb24b69 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 |