[telepathy-gabble/master] Move headers available to plugins to gabble/

[Will Thompson]

This makes it obvious which headers plugins can use, as well as making
it possible to write both gabble.pc and gabble-uninstalled.pc without
moving the whole of src/ to gabble/.
---
 {src => gabble}/plugin.h  |    0 
 {src => gabble}/sidecar.h |    0 
 plugins/Makefile.am       |    2 +-
 src/Makefile.am           |    5 +++--
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename {src => gabble}/plugin.h (100%)
 rename {src => gabble}/sidecar.h (100%)

diff --git a/src/plugin.h b/gabble/plugin.h
similarity index 100%
rename from src/plugin.h
rename to gabble/plugin.h
diff --git a/src/sidecar.h b/gabble/sidecar.h
similarity index 100%
rename from src/sidecar.h
rename to gabble/sidecar.h
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 00117e7..4301e12 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -11,6 +11,6 @@ test_la_LDFLAGS = -module -avoid-version -rpath $(plugindir) -lm
 
 AM_CFLAGS = $(ERROR_CFLAGS) @DBUS_CFLAGS@ @GLIB_CFLAGS@ @WOCKY_CFLAGS@ \
     @TP_GLIB_CFLAGS@ \
-    -I $(top_srcdir)/src -I $(top_builddir)/src \
+    -I $(top_gabbledir)/gabble -I $(top_builddir)/gabble \
     -I $(top_srcdir) -I $(top_builddir) \
     -I $(top_srcdir)/plugins
diff --git a/src/Makefile.am b/src/Makefile.am
index 9034676..304e788 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,7 +106,7 @@ libgabble_convenience_la_SOURCES = \
     olpc-view.c \
     plugin-loader.h \
     plugin-loader.c \
-    plugin.h \
+    $(top_srcdir)/gabble/plugin.h \
     plugin.c \
     presence.h \
     presence.c \
@@ -130,7 +130,7 @@ libgabble_convenience_la_SOURCES = \
     search-channel.c \
     search-manager.h \
     search-manager.c \
-    sidecar.h \
+    $(top_srcdir)/gabble/sidecar.h \
     sidecar.c \
     tube-iface.h \
     tube-iface.c \
@@ -180,6 +180,7 @@ AM_CFLAGS = $(ERROR_CFLAGS) -I$(top_srcdir) -I$(top_builddir) \
 	    @HANDLE_LEAK_DEBUG_CFLAGS@ @TP_GLIB_CFLAGS@ \
 	    @SOUP_CFLAGS@ @UUID_CFLAGS@ @GMODULE_CFLAGS@ \
 	    -I $(top_srcdir)/lib -I $(top_builddir)/lib \
+	    -I $(top_srcdir)/gabble \
 	    -DG_LOG_DOMAIN=\"gabble\" \
 	    -DPLUGIN_DIR=\"$(libdir)/telepathy/gabble-0\"
 
-- 
1.5.6.5