diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-09-05 15:41:48 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-09-05 15:41:48 +0100 |
| commit | 76fb29dab308aa6024bdfe5db329a155635fe620 (patch) | |
| tree | 6295f801c5a83ecde1162b4c999dec8b11aa0aaf | |
| parent | 72288fb7391e7e24dabe36941b777eb603694ee6 (diff) | |
salut: move some common to a separate directory
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | plugin-base/Makefile.am | 5 | ||||
| -rw-r--r-- | plugin-base/caps-manager.c (renamed from salut/caps-manager.c) | 4 | ||||
| -rw-r--r-- | plugin-base/caps-manager.h (renamed from salut/caps-manager.h) | 0 | ||||
| -rw-r--r-- | plugin-base/utils.c (renamed from salut/utils.c) | 0 | ||||
| -rw-r--r-- | plugin-base/utils.h (renamed from salut/utils.h) | 0 | ||||
| -rw-r--r-- | salut/Makefile.am | 10 |
8 files changed, 17 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index a2f5ee3..cc5edb5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = \ mission-control \ + plugin-base \ salut \ tests diff --git a/configure.ac b/configure.ac index ae8be87..e6bd745 100644 --- a/configure.ac +++ b/configure.ac @@ -111,6 +111,7 @@ AC_SUBST(CFLAGS) AC_OUTPUT([ Makefile mission-control/Makefile + plugin-base/Makefile salut/Makefile tests/Makefile tests/twisted/Makefile diff --git a/plugin-base/Makefile.am b/plugin-base/Makefile.am new file mode 100644 index 0000000..dfaa9f9 --- /dev/null +++ b/plugin-base/Makefile.am @@ -0,0 +1,5 @@ +EXTRA_DIST = \ + caps-manager.c \ + caps-manager.h \ + utils.c \ + utils.h diff --git a/salut/caps-manager.c b/plugin-base/caps-manager.c index 09b32a8..be61ef1 100644 --- a/salut/caps-manager.c +++ b/plugin-base/caps-manager.c @@ -30,7 +30,11 @@ #include <wocky/wocky-data-form.h> #include <wocky/wocky-namespaces.h> +#ifdef SALUT #include <salut/caps-channel-manager.h> +#else +#include <gabble/caps-channel-manager.h> +#endif #include "utils.h" diff --git a/salut/caps-manager.h b/plugin-base/caps-manager.h index e25d89b..e25d89b 100644 --- a/salut/caps-manager.h +++ b/plugin-base/caps-manager.h diff --git a/salut/utils.c b/plugin-base/utils.c index 255f400..255f400 100644 --- a/salut/utils.c +++ b/plugin-base/utils.c diff --git a/salut/utils.h b/plugin-base/utils.h index e73ca8e..e73ca8e 100644 --- a/salut/utils.h +++ b/plugin-base/utils.h diff --git a/salut/Makefile.am b/salut/Makefile.am index c71be85..181154c 100644 --- a/salut/Makefile.am +++ b/salut/Makefile.am @@ -1,5 +1,7 @@ AM_CFLAGS = \ -DG_LOG_DOMAIN=\"ytstenut\" \ + -DSALUT \ + -I$(top_srcdir)/plugin-base \ $(SALUT_CFLAGS) \ $(TELEPATHY_YTSTENUT_CFLAGS) @@ -16,13 +18,13 @@ ytstenut_salut_la_LIBADD = \ ytstenut_salut_la_SOURCES = \ ytstenut.c \ ytstenut.h \ - caps-manager.c \ - caps-manager.h \ + $(top_srcdir)/plugin-base/caps-manager.c \ + $(top_srcdir)/plugin-base/caps-manager.h \ status.c \ status.h \ message-channel.c \ message-channel.h \ channel-manager.c \ channel-manager.h \ - utils.c \ - utils.h + $(top_srcdir)/plugin-base/utils.c \ + $(top_srcdir)/plugin-base/utils.h |