aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bigonville <bigon@bigon.be>2009-11-18 23:57:24 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-11-19 00:06:14 +0800
commitdb67069547cedf5728d0015b1c207da6bd5445f0 (patch)
treeddc8d23ab8a793c02f6cdc91f394d74983af9159
parentd2da82d9684bd97038c95be1cef8cedf07e6df32 (diff)
downloadgsoc2013-empathy-db67069547cedf5728d0015b1c207da6bd5445f0.tar
gsoc2013-empathy-db67069547cedf5728d0015b1c207da6bd5445f0.tar.gz
gsoc2013-empathy-db67069547cedf5728d0015b1c207da6bd5445f0.tar.bz2
gsoc2013-empathy-db67069547cedf5728d0015b1c207da6bd5445f0.tar.lz
gsoc2013-empathy-db67069547cedf5728d0015b1c207da6bd5445f0.tar.xz
gsoc2013-empathy-db67069547cedf5728d0015b1c207da6bd5445f0.tar.zst
gsoc2013-empathy-db67069547cedf5728d0015b1c207da6bd5445f0.zip
Move empathy-log to tests/interactive and don't install it anymore
-rw-r--r--src/.gitignore1
-rw-r--r--src/Makefile.am5
-rw-r--r--tests/interactive/.gitignore1
-rw-r--r--tests/interactive/Makefile.am2
-rw-r--r--tests/interactive/empathy-logs.c (renamed from src/empathy-logs.c)0
5 files changed, 4 insertions, 5 deletions
diff --git a/src/.gitignore b/src/.gitignore
index a7f583649..17f66a507 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,6 +1,5 @@
empathy
empathy-accounts
-empathy-logs
empathy-chat-chandler
empathy-call-chandler
empathy-tubes-chandler
diff --git a/src/Makefile.am b/src/Makefile.am
index b61f9d34a..ecec8923f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,7 @@ LDADD = \
$(WEBKIT_LIBS)
bin_PROGRAMS = \
- empathy \
- empathy-logs
+ empathy
BUILT_SOURCES= \
empathy-tube-dispatch-enumtypes.h \
@@ -59,8 +58,6 @@ empathy_SOURCES = \
nodist_empathy_SOURCES = $(BUILT_SOURCES)
-empathy_logs_SOURCES = empathy-logs.c
-
check_c_sources = \
$(empathy_handwritten_source) \
$(empathy_logs_SOURCES)
diff --git a/tests/interactive/.gitignore b/tests/interactive/.gitignore
index f5c45764e..f6f87d8b4 100644
--- a/tests/interactive/.gitignore
+++ b/tests/interactive/.gitignore
@@ -1,4 +1,5 @@
contact-manager
+empathy-logs
contact-run-until-ready
contact-run-until-ready-2
empetit
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index a66f518e9..7770e768f 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -13,6 +13,7 @@ LDADD = \
noinst_PROGRAMS = \
contact-manager \
+ empathy-logs \
empetit \
test-empathy-account-assistant \
test-empathy-presence-chooser \
@@ -20,6 +21,7 @@ noinst_PROGRAMS = \
test-empathy-protocol-chooser
contact_manager_SOURCES = contact-manager.c
+empathy_logs_SOURCES = empathy-logs.c
empetit_SOURCES = empetit.c
test_empathy_presence_chooser_SOURCES = test-empathy-presence-chooser.c
test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c
diff --git a/src/empathy-logs.c b/tests/interactive/empathy-logs.c
index b9f38e0e7..b9f38e0e7 100644
--- a/src/empathy-logs.c
+++ b/tests/interactive/empathy-logs.c