summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorImran Zaman <imran.zaman@intel.com>2014-08-01 14:28:05 +0300
committerImran Zaman <imran.zaman@intel.com>2014-08-01 14:28:19 +0300
commit115c5701353e2239611d8cf2ab95fc6f5f4a1b45 (patch)
tree5d2172ba17b6829d91e6376a17b7e2e45072bafc /tests
parent6880053624a44e83adc62537e6737a3868df8c42 (diff)
downloadtlm-115c5701353e2239611d8cf2ab95fc6f5f4a1b45.tar.gz
tlm-115c5701353e2239611d8cf2ab95fc6f5f4a1b45.tar.bz2
tlm-115c5701353e2239611d8cf2ab95fc6f5f4a1b45.zip
Change-Id: Ib83f9f4355ffab4ba079e58331accf89923ca9b3 Signed-off-by: Imran Zaman <imran.zaman@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/config/Makefile.am2
-rw-r--r--tests/config/Makefile.in4
-rw-r--r--tests/daemon/Makefile.am5
-rw-r--r--tests/daemon/Makefile.in10
-rw-r--r--tests/daemon/daemon-test.c4
5 files changed, 11 insertions, 14 deletions
diff --git a/tests/config/Makefile.am b/tests/config/Makefile.am
index efba0e7..330ff9d 100644
--- a/tests/config/Makefile.am
+++ b/tests/config/Makefile.am
@@ -13,6 +13,6 @@ configtest_CFLAGS = \
configtest_LDADD = \
$(TLM_LIBS) \
$(CHECK_LIBS) \
- $(abs_top_builddir)/src/common/libtlm_plugin_la-tlm-config.lo
+ $(abs_top_builddir)/src/common/libtlm_common_la-tlm-config.lo
EXTRA_DIST = test.conf
diff --git a/tests/config/Makefile.in b/tests/config/Makefile.in
index e49f95f..c498729 100644
--- a/tests/config/Makefile.in
+++ b/tests/config/Makefile.in
@@ -98,7 +98,7 @@ am_configtest_OBJECTS = configtest-config.$(OBJEXT)
configtest_OBJECTS = $(am_configtest_OBJECTS)
am__DEPENDENCIES_1 =
configtest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(abs_top_builddir)/src/common/libtlm_plugin_la-tlm-config.lo
+ $(abs_top_builddir)/src/common/libtlm_common_la-tlm-config.lo
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -524,7 +524,7 @@ configtest_CFLAGS = \
configtest_LDADD = \
$(TLM_LIBS) \
$(CHECK_LIBS) \
- $(abs_top_builddir)/src/common/libtlm_plugin_la-tlm-config.lo
+ $(abs_top_builddir)/src/common/libtlm_common_la-tlm-config.lo
EXTRA_DIST = test.conf
all: all-am
diff --git a/tests/daemon/Makefile.am b/tests/daemon/Makefile.am
index 48bf88d..841ffe5 100644
--- a/tests/daemon/Makefile.am
+++ b/tests/daemon/Makefile.am
@@ -23,8 +23,7 @@ daemontest_CFLAGS = \
daemontest_LDADD = \
$(TLM_LIBS) \
$(CHECK_LIBS) \
- $(abs_top_builddir)/src/daemon/tlm-tlm-utils.o \
- $(abs_top_builddir)/src/daemon/dbus/libtlm-dbus.la \
- $(abs_top_builddir)/src/common/dbus/libtlm-dbus-glue.la
+ $(abs_top_builddir)/src/common/libtlm-common.la \
+ $(abs_top_builddir)/src/daemon/dbus/libtlm-dbus.la
CLEANFILES = *.gcno *.gcda
diff --git a/tests/daemon/Makefile.in b/tests/daemon/Makefile.in
index d85eb9c..9731984 100644
--- a/tests/daemon/Makefile.in
+++ b/tests/daemon/Makefile.in
@@ -99,9 +99,8 @@ am_daemontest_OBJECTS = daemontest-daemon-test.$(OBJEXT)
daemontest_OBJECTS = $(am_daemontest_OBJECTS)
am__DEPENDENCIES_1 =
daemontest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(abs_top_builddir)/src/daemon/tlm-tlm-utils.o \
- $(abs_top_builddir)/src/daemon/dbus/libtlm-dbus.la \
- $(abs_top_builddir)/src/common/dbus/libtlm-dbus-glue.la
+ $(abs_top_builddir)/src/common/libtlm-common.la \
+ $(abs_top_builddir)/src/daemon/dbus/libtlm-dbus.la
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -534,9 +533,8 @@ daemontest_CFLAGS = \
daemontest_LDADD = \
$(TLM_LIBS) \
$(CHECK_LIBS) \
- $(abs_top_builddir)/src/daemon/tlm-tlm-utils.o \
- $(abs_top_builddir)/src/daemon/dbus/libtlm-dbus.la \
- $(abs_top_builddir)/src/common/dbus/libtlm-dbus-glue.la
+ $(abs_top_builddir)/src/common/libtlm-common.la \
+ $(abs_top_builddir)/src/daemon/dbus/libtlm-dbus.la
CLEANFILES = *.gcno *.gcda
all: all-am
diff --git a/tests/daemon/daemon-test.c b/tests/daemon/daemon-test.c
index 203217e..51c4811 100644
--- a/tests/daemon/daemon-test.c
+++ b/tests/daemon/daemon-test.c
@@ -40,8 +40,8 @@
#include "common/tlm-log.h"
#include "common/tlm-config.h"
#include "common/dbus/tlm-dbus-login-gen.h"
-#include "daemon/tlm-utils.h"
-#include "daemon/dbus/tlm-dbus-utils.h"
+#include "common/tlm-utils.h"
+#include "common/dbus/tlm-dbus-utils.h"
static gchar *exe_name = 0;
static GPid daemon_pid = 0;