diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-03-21 08:58:09 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-03-21 08:58:09 +0000 |
| commit | cde06ccf071f793a81e0f71627719d7753d9430d (patch) | |
| tree | f0b43c4009b70f92e89b0e41ddfb406dcf6b3611 /src/Makefile.am | |
| parent | 3c112f53e732306b95f1c01050972ac5fd6ecae2 (diff) | |
| parent | 14e2d72bbeae565a53fe8bd32f375c0cec3715c0 (diff) | |
| download | telepathy-salut-cde06ccf071f793a81e0f71627719d7753d9430d.tar.gz | |
Merge branch 'sidetzars'
Conflicts:
extensions/all.xml
salut/Makefile.am
src/salut-connection.c
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 22b7a0b0..8056bb80 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,7 +88,10 @@ CORE_SOURCES = \ plugin-loader.c \ plugin-loader.h \ $(top_srcdir)/salut/plugin.h \ - plugin.c + plugin.c \ + $(top_srcdir)/salut/connection.h \ + $(top_srcdir)/salut/sidecar.h \ + sidecar.c AVAHI_BACKEND_SOURCES = \ salut-avahi-discovery-client.h \ |