diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 13 | ||||
| -rw-r--r-- | tests/twisted/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/twisted/main-debug.c | 2 | ||||
| -rw-r--r-- | tests/twisted/tools/Makefile.am | 2 | ||||
| -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 |
5 files changed, 16 insertions, 6 deletions
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 |