diff options
| -rw-r--r-- | src/.gitignore | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/interactive/.gitignore | 1 | ||||
| -rw-r--r-- | tests/interactive/Makefile.am | 2 | ||||
| -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 |