diff options
| -rw-r--r-- | salut/Makefile.am | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/plugin-loader.c | 2 | ||||
| -rw-r--r-- | src/plugin.c | 3 | ||||
| -rw-r--r-- | src/protocol.h (renamed from salut/protocol.h) | 0 |
5 files changed, 5 insertions, 7 deletions
diff --git a/salut/Makefile.am b/salut/Makefile.am index f9befdbe..92f5c615 100644 --- a/salut/Makefile.am +++ b/salut/Makefile.am @@ -7,7 +7,6 @@ salutinclude_HEADERS = \ plugin.h \ plugin-connection.h \ plugin-contact.h \ - protocol.h \ caps-channel-manager.h \ capabilities.h \ capability-set.h \ diff --git a/src/Makefile.am b/src/Makefile.am index 58d64b29..f72caed9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -77,9 +77,9 @@ CORE_SOURCES = \ tubes-channel.c \ util.h \ util.c \ - protocol.c \ - $(top_srcdir)/salut/protocol.h \ - plugin-loader.c \ + protocol.c \ + protocol.h \ + plugin-loader.c \ plugin-loader.h AVAHI_BACKEND_SOURCES = \ diff --git a/src/plugin-loader.c b/src/plugin-loader.c index f19d289f..efcb7539 100644 --- a/src/plugin-loader.c +++ b/src/plugin-loader.c @@ -33,7 +33,7 @@ #define DEBUG_FLAG DEBUG_PLUGIN #include "debug.h" #include "salut/plugin.h" -#include "salut/protocol.h" +#include "protocol.h" G_DEFINE_TYPE(SalutPluginLoader, salut_plugin_loader, diff --git a/src/plugin.c b/src/plugin.c index eade9599..2f421cbf 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -22,10 +22,9 @@ #include <telepathy-glib/util.h> -#include <salut/protocol.h> - #define DEBUG_FLAG DEBUG_PLUGINS #include "debug.h" +#include "protocol.h" G_DEFINE_INTERFACE (SalutPlugin, salut_plugin, G_TYPE_OBJECT) diff --git a/salut/protocol.h b/src/protocol.h index 5fc96634..5fc96634 100644 --- a/salut/protocol.h +++ b/src/protocol.h |