From 1e3d1ceedd6d5deac1a652b9e8e2d4e0726c3163 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sat, 7 May 2011 12:53:39 -0400 Subject: [PATCH] Move babeltrace-log to converter directory Signed-off-by: Mathieu Desnoyers --- converter/Makefile.am | 8 +++++++- tests/test-dummytrace.c => converter/babeltrace-log.c | 1 - tests/Makefile.am | 9 +-------- 3 files changed, 8 insertions(+), 10 deletions(-) rename tests/test-dummytrace.c => converter/babeltrace-log.c (99%) diff --git a/converter/Makefile.am b/converter/Makefile.am index 4d573616..e7bcc690 100644 --- a/converter/Makefile.am +++ b/converter/Makefile.am @@ -1,6 +1,6 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -lpopt -bin_PROGRAMS = babeltrace +bin_PROGRAMS = babeltrace babeltrace-log lib_LTLIBRARIES = libbabeltrace.la @@ -18,3 +18,9 @@ babeltrace_SOURCES = \ babeltrace_LDADD = \ libbabeltrace.la \ $(top_builddir)/formats/libbabeltrace_registry.la + +babeltrace_log_SOURCES = babeltrace-log.c + +babeltrace_log_LDADD = \ + $(top_builddir)/formats/libbabeltrace_registry.la \ + $(top_builddir)/formats/ctf/libctf.la diff --git a/tests/test-dummytrace.c b/converter/babeltrace-log.c similarity index 99% rename from tests/test-dummytrace.c rename to converter/babeltrace-log.c index aa855cc7..b320cbb0 100644 --- a/tests/test-dummytrace.c +++ b/converter/babeltrace-log.c @@ -150,7 +150,6 @@ retry: ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT); ctf_move_pos(&dummy, len * CHAR_BIT); if (ctf_pos_packet(&dummy)) { - /* TODO write content size */ ctf_pos_pad_packet(pos); write_packet_header(pos, s_uuid); write_packet_context(pos); diff --git a/tests/Makefile.am b/tests/Makefile.am index 583f7ac6..642dd983 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,5 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -noinst_PROGRAMS = test-bitfield test-dummytrace +noinst_PROGRAMS = test-bitfield test_bitfield_SOURCES = test-bitfield.c - -test_dummytrace_SOURCES = test-dummytrace.c - - -test_dummytrace_LDADD = \ - $(top_builddir)/formats/libbabeltrace_registry.la \ - $(top_builddir)/formats/ctf/libctf.la -- 2.34.1