summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore6
-rw-r--r--configure.ac4
-rw-r--r--doc/Makefile.am10
-rw-r--r--src/Makefile.am1
-rw-r--r--src/telepathy-logger.c2
-rw-r--r--telepathy-logger/Makefile.am8
-rw-r--r--tests/Makefile.am13
-rw-r--r--tests/twisted/Makefile.am3
-rw-r--r--tests/twisted/main-debug.c2
-rw-r--r--tests/twisted/tools/Makefile.am2
-rw-r--r--tests/twisted/tools/org.freedesktop.Telepathy.Client.Logger.service.in (renamed from tests/twisted/tools/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in)2
-rw-r--r--tools/Makefile.am4
12 files changed, 46 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 398f2b6..b96349f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+ChangeLog
Makefile
Makefile.in
configure
@@ -38,6 +39,9 @@ config.*
*.pyc
*.pyo
+telepathy-logger-*/
+telepathy-logger-*.tar.bz2
+
src/telepathy-logger
src/test-api
@@ -54,7 +58,7 @@ extensions/doc/
tests/test-*[^ch]
tests/twisted/telepathy-logger-debug
tests/twisted/tools/exec-with-log.sh
-tests/twisted/tools/org.freedesktop.Telepathy.Client.TelepathyLogger.service
+tests/twisted/tools/org.freedesktop.Telepathy.Client.Logger.service
tests/twisted/tools/tmp-session-bus.conf
doc/reference/libtelepathy-logger/*.stamp
diff --git a/configure.ac b/configure.ac
index e6f99ea..9286d85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ m4_define(tpl_maybe_datestamp,
m4_define(tpl_version, tpl_full_version[]tpl_maybe_datestamp)
-AC_INIT(TelepathyLogger, tpl_version, https://bugs.freedesktop.org/buglist.cgi?product=Telepathy&component=logger)
+AC_INIT(telepathy-logger, tpl_version, https://bugs.freedesktop.org/buglist.cgi?product=Telepathy&component=logger)
DBUS_SERVICES_DIR="$datadir/dbus-1/services"
AC_SUBST(DBUS_SERVICES_DIR)
@@ -51,7 +51,7 @@ AC_CONFIG_AUX_DIR(.)
GNOME_COMMON_INIT
-AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define -Wno-portability)
+AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define no-dist-gzip tar-ustar -Wno-portability)
AC_ISC_POSIX
AC_PROG_CC
AC_HEADER_STDC
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f3ddc22..9fc6618 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1,11 @@
SUBDIRS = reference
+
+EXTRA_DIST = \
+ templates/errors.html \
+ templates/interfaces.html \
+ templates/style.css \
+ templates/generic-types.html \
+ templates/index.html \
+ templates/interface.html \
+ templates/devhelp.devhelp2 \
+ templates/fullindex.html
diff --git a/src/Makefile.am b/src/Makefile.am
index b6276b3..a97eb49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/tools/flymake.mk
AM_CPPFLAGS = \
-I$(top_builddir) \
+ -I$(top_srcdir) \
$(ERROR_CFLAGS) \
-DG_LOG_DOMAIN=\"TPL\" \
$(LIBTPL_CFLAGS) \
diff --git a/src/telepathy-logger.c b/src/telepathy-logger.c
index 64fcb32..aa83223 100644
--- a/src/telepathy-logger.c
+++ b/src/telepathy-logger.c
@@ -19,7 +19,7 @@
* Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
*/
-#include <../config.h>
+#include <config.h>
#include <glib.h>
#include <telepathy-glib/telepathy-glib.h>
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index 681487a..affb05c 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -2,6 +2,8 @@ include $(top_srcdir)/tools/shave.mk
include $(top_srcdir)/tools/flymake.mk
AM_CPPFLAGS = \
+ -I$(top_builddir) \
+ -I$(top_srcdir) \
$(ERROR_CFLAGS) \
-DG_LOG_DOMAIN=\"libtelepathy-logger\" \
$(LIBTPL_CFLAGS) \
@@ -18,17 +20,21 @@ lib_LTLIBRARIES = libtelepathy-logger.la
LIBTPLdir = $(includedir)/telepathy-logger
LIBTPL_HEADERS = \
action-chain.h \
- contact.h \
channel.h \
+ channel-factory.h \
channel-text.h \
+ conf.h \
+ contact.h \
datetime.h \
dbus-service.h \
debug.h \
log-entry.h \
log-entry-text.h \
log-manager.h \
+ log-manager-priv.h \
log-store.h \
log-store-empathy.h \
+ log-store-factory.h \
observer.h \
util.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9666416..9aa10b8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,15 +18,22 @@ noinst_PROGRAMS = \
test_tpl_channel_SOURCES = \
test-tpl-channel.c \
- tpl-channel-test.c
+ tpl-channel-test.c \
+ tpl-channel-test.h
test_tpl_observer_SOURCES = \
test-tpl-observer.c \
tpl-channel-test.c
+test_searches_SOURCES = \
+ test-searches.c \
+ constants.h
-AM_CFLAGS = $(ERROR_CFLAGS) $(LIBTPL_CFLAGS) \
- -I $(top_srcdir)/telepathy-logger -I $(top_builddir)/src
+AM_CFLAGS = \
+ $(ERROR_CFLAGS) \
+ $(LIBTPL_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_builddir)
TESTS = $(noinst_PROGRAMS)
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index f653758..60c0c09 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -77,6 +77,9 @@ telepathy_logger_debug_LDADD = \
telepathy_logger_debug_LDFLAGS = -export-dynamic
AM_CFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/tests \
+ -I$(top_builddir) \
$(ERROR_CFLAGS) \
${TPL_CFLAGS}
diff --git a/tests/twisted/main-debug.c b/tests/twisted/main-debug.c
index 870fb66..4a343f6 100644
--- a/tests/twisted/main-debug.c
+++ b/tests/twisted/main-debug.c
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "../tpl-channel-test.h"
+#include <tpl-channel-test.h>
#include <stdlib.h>
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index adbe42d..466ca33 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -13,7 +13,7 @@ exec-with-log.sh: exec-with-log.sh.in
# Don't use the full filename for the .in if > 99 character: >99 char filenames
# in tarballs are non-portable (and automake 1.8 doesn't let us build
# non-archaic tarballs)
-service_in_files = org.freedesktop.Telepathy.Client.TelepathyLogger.service.in
+service_in_files = org.freedesktop.Telepathy.Client.Logger.service.in
service_files = $(service_in_files:.service.in=.service)
# D-Bus config file for testing
diff --git a/tests/twisted/tools/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in b/tests/twisted/tools/org.freedesktop.Telepathy.Client.Logger.service.in
index dea0473..3deff28 100644
--- a/tests/twisted/tools/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in
+++ b/tests/twisted/tools/org.freedesktop.Telepathy.Client.Logger.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.TelepathyLogger
+Name=org.freedesktop.Telepathy.Client.Logger
Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 71bede7..64b2a47 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,14 +4,18 @@ EXTRA_DIST = \
check-c-style.sh \
check-misc.sh \
check-whitespace.sh \
+ doc-generator.py \
doc-generator.xsl \
+ glib-client-gen.py \
glib-ginterface-gen.py \
glib-gtypes-generator.py \
glib-interfaces-gen.py \
glib-signals-marshal-gen.py \
+ identity.xsl \
lcov.am \
libglibcodegen.py \
libtpcodegen.py \
+ specparser.py \
telepathy.am \
xincludator.py
View Lorry Controller Status