Move extensions into telepathy-logger/extensions/

That's a better place for them when we merge this into telepathy-glib.

15 files changed, 38 insertions, 32 deletions

diff --git a/.gitignore b/.gitignore
index 6aa207b1d..d7ed444a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,9 +68,9 @@ cscope.out
 /docs/reference/libtelepathy-logger/tmpl/
 /docs/reference/libtelepathy-logger/xml/
 
-/extensions/tpl-extensions.pc
-/extensions/_gen/
-/extensions/doc/
+/telepathy-logger/extensions/tpl-extensions.pc
+/telepathy-logger/extensions/_gen/
+/telepathy-logger/extensions/doc/
 
 /src/telepathy-logger
 /src/test-api
diff --git a/Makefile.am b/Makefile.am
index 05f46fe69..43f4b576c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tools extensions telepathy-logger data tests docs po
+SUBDIRS = tools telepathy-logger data tests docs po
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/configure.ac b/configure.ac
index 3b5cbbb6a..97c1fb167 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,10 +204,10 @@ AC_CONFIG_FILES([
    docs/Makefile
    docs/reference/Makefile
    docs/reference/libtelepathy-logger/Makefile
-   extensions/Makefile
-   extensions/tpl-extensions.pc
    po/Makefile.in
    telepathy-logger/Makefile
+   telepathy-logger/extensions/Makefile
+   telepathy-logger/extensions/tpl-extensions.pc
    telepathy-logger/telepathy-logger-1.pc
    telepathy-logger/telepathy-logger-1-uninstalled.pc
    tools/Makefile
diff --git a/extensions/extensions.h b/extensions/extensions.h
deleted file mode 100644
index 7f2bc3a41..000000000
--- a/extensions/extensions.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _TPL_EXTENSIONS_H
-#define _TPL_EXTENSIONS_H
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include "_gen/enums.h"
-#include "_gen/cli-misc.h"
-#include "_gen/svc-misc.h"
-
-G_BEGIN_DECLS
-
-#include "_gen/gtypes.h"
-#include "_gen/interfaces.h"
-
-G_END_DECLS
-
-void tpl_cli_init (void);
-
-#endif /* _TPL_EXTENSIONS_H */
-
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index b6668c3d5..bc775b465 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/tools/flymake.mk
 
+SUBDIRS = extensions .
+
 if HAVE_INTROSPECTION
 include $(INTROSPECTION_MAKEFILE)
 endif
@@ -9,7 +11,6 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_srcdir)
 
 AM_CPPFLAGS =						\
 	-I$(top_builddir)				\
-	-I$(top_builddir)/extensions			\
 	-I$(top_srcdir)					\
 	$(ERROR_CFLAGS)					\
 	-DG_LOG_DOMAIN=\"tp-logger\"			\
@@ -112,7 +113,7 @@ nodist_libtelepathy_logger_1_la_SOURCES = \
 		$(BUILT_SOURCES)
 
 libtelepathy_logger_1_la_LIBADD = \
-	$(top_builddir)/extensions/libtpl-extensions-convenience.la
+	extensions/libtpl-extensions-convenience.la
 
 check_c_sources = \
 	$(libtelepathy_logger_1_la_SOURCES)	\
diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
index d76b76e7b..1e0d4ff5d 100644
--- a/telepathy-logger/dbus-service.c
+++ b/telepathy-logger/dbus-service.c
@@ -34,7 +34,7 @@
 #include <telepathy-logger/log-manager-internal.h>
 #include <telepathy-logger/client-factory-internal.h>
 
-#include <extensions/extensions.h>
+#include "telepathy-logger/extensions/extensions.h"
 
 #define DEBUG_FLAG TPL_DEBUG_DBUS_SERVICE
 #include <telepathy-logger/action-chain-internal.h>
diff --git a/extensions/Logger.xml b/telepathy-logger/extensions/Logger.xml
index fcfd36de7..fcfd36de7 100644
--- a/extensions/Logger.xml
+++ b/telepathy-logger/extensions/Logger.xml
diff --git a/extensions/Makefile.am b/telepathy-logger/extensions/Makefile.am
index 4f6c10431..3efa706bf 100644
--- a/extensions/Makefile.am
+++ b/telepathy-logger/extensions/Makefile.am
@@ -2,6 +2,11 @@ tools_dir = $(top_srcdir)/tools
 
 pkgconfigdir = $(libdir)/pkgconfig
 
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	$(NULL)
+
 pkgconfig_DATA =
 if ENABLE_PUBLIC_EXTENSIONS
 pkgconfig_DATA += tpl-extensions.pc
diff --git a/extensions/all.xml b/telepathy-logger/extensions/all.xml
index efe90b06c..efe90b06c 100644
--- a/extensions/all.xml
+++ b/telepathy-logger/extensions/all.xml
diff --git a/extensions/extensions-cli.c b/telepathy-logger/extensions/extensions-cli.c
index 7fd5c86f3..62e06bdea 100644
--- a/extensions/extensions-cli.c
+++ b/telepathy-logger/extensions/extensions-cli.c
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#include "extensions.h"
+#include "telepathy-logger/extensions/extensions.h"
 
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/proxy-subclass.h>
diff --git a/extensions/extensions.c b/telepathy-logger/extensions/extensions.c
index 0f850428d..f5a276f2d 100644
--- a/extensions/extensions.c
+++ b/telepathy-logger/extensions/extensions.c
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#include "extensions.h"
+#include "telepathy-logger/extensions/extensions.h"
 
 #include <telepathy-glib/proxy-subclass.h>
 
diff --git a/telepathy-logger/extensions/extensions.h b/telepathy-logger/extensions/extensions.h
new file mode 100644
index 000000000..c80827dd0
--- /dev/null
+++ b/telepathy-logger/extensions/extensions.h
@@ -0,0 +1,20 @@
+#ifndef _TPL_EXTENSIONS_H
+#define _TPL_EXTENSIONS_H
+
+#include <telepathy-glib/telepathy-glib.h>
+
+#include "telepathy-logger/extensions/_gen/enums.h"
+#include "telepathy-logger/extensions/_gen/cli-misc.h"
+#include "telepathy-logger/extensions/_gen/svc-misc.h"
+
+G_BEGIN_DECLS
+
+#include "telepathy-logger/extensions/_gen/gtypes.h"
+#include "telepathy-logger/extensions/_gen/interfaces.h"
+
+G_END_DECLS
+
+void tpl_cli_init (void);
+
+#endif /* _TPL_EXTENSIONS_H */
+
diff --git a/extensions/misc.xml b/telepathy-logger/extensions/misc.xml
index 3b3bc0ea6..3b3bc0ea6 100644
--- a/extensions/misc.xml
+++ b/telepathy-logger/extensions/misc.xml
diff --git a/extensions/tpl-extensions.pc.in b/telepathy-logger/extensions/tpl-extensions.pc.in
index a24903c6f..a24903c6f 100644
--- a/extensions/tpl-extensions.pc.in
+++ b/telepathy-logger/extensions/tpl-extensions.pc.in
diff --git a/telepathy-logger/test-api.c b/telepathy-logger/test-api.c
index ef5a3c999..564e25888 100644
--- a/telepathy-logger/test-api.c
+++ b/telepathy-logger/test-api.c
@@ -28,7 +28,7 @@
 #include <telepathy-glib/proxy-subclass.h>
 
 #include <telepathy-logger/dbus-service-internal.h>
-#include <extensions/extensions.h>
+#include "telepathy-logger/extensions/extensions.h"
 
 static GMainLoop *mainloop = NULL;