From 61763ad5f7854ae00aef7eed029e7f95179ce6a5 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Wed, 3 Apr 2019 12:56:17 -0400 Subject: [PATCH] Cleanup: Move `debug-info` in its own sub-directory Signed-off-by: Francis Deslauriers --- configure.ac | 1 + plugins/lttng-utils/Makefile.am | 33 ++++--------------- plugins/lttng-utils/debug-info/Makefile.am | 24 ++++++++++++++ .../lttng-utils/{ => debug-info}/bin-info.c | 0 .../lttng-utils/{ => debug-info}/bin-info.h | 0 plugins/lttng-utils/{ => debug-info}/crc32.c | 0 plugins/lttng-utils/{ => debug-info}/crc32.h | 0 .../lttng-utils/{ => debug-info}/debug-info.c | 0 .../lttng-utils/{ => debug-info}/debug-info.h | 0 plugins/lttng-utils/{ => debug-info}/dwarf.c | 0 plugins/lttng-utils/{ => debug-info}/dwarf.h | 0 .../lttng-utils/{ => debug-info}/logging.c | 0 .../lttng-utils/{ => debug-info}/logging.h | 0 .../{ => debug-info}/trace-ir-data-copy.c | 0 .../{ => debug-info}/trace-ir-data-copy.h | 0 .../{ => debug-info}/trace-ir-mapping.c | 0 .../{ => debug-info}/trace-ir-mapping.h | 0 .../{ => debug-info}/trace-ir-metadata-copy.c | 0 .../{ => debug-info}/trace-ir-metadata-copy.h | 0 .../trace-ir-metadata-field-class-copy.c | 0 .../trace-ir-metadata-field-class-copy.h | 0 plugins/lttng-utils/{ => debug-info}/utils.c | 0 plugins/lttng-utils/{ => debug-info}/utils.h | 0 plugins/lttng-utils/plugin.c | 2 +- tests/plugins/Makefile.am | 4 +-- tests/plugins/test_bin_info.c | 2 +- tests/plugins/test_dwarf.c | 2 +- 27 files changed, 37 insertions(+), 31 deletions(-) create mode 100644 plugins/lttng-utils/debug-info/Makefile.am rename plugins/lttng-utils/{ => debug-info}/bin-info.c (100%) rename plugins/lttng-utils/{ => debug-info}/bin-info.h (100%) rename plugins/lttng-utils/{ => debug-info}/crc32.c (100%) rename plugins/lttng-utils/{ => debug-info}/crc32.h (100%) rename plugins/lttng-utils/{ => debug-info}/debug-info.c (100%) rename plugins/lttng-utils/{ => debug-info}/debug-info.h (100%) rename plugins/lttng-utils/{ => debug-info}/dwarf.c (100%) rename plugins/lttng-utils/{ => debug-info}/dwarf.h (100%) rename plugins/lttng-utils/{ => debug-info}/logging.c (100%) rename plugins/lttng-utils/{ => debug-info}/logging.h (100%) rename plugins/lttng-utils/{ => debug-info}/trace-ir-data-copy.c (100%) rename plugins/lttng-utils/{ => debug-info}/trace-ir-data-copy.h (100%) rename plugins/lttng-utils/{ => debug-info}/trace-ir-mapping.c (100%) rename plugins/lttng-utils/{ => debug-info}/trace-ir-mapping.h (100%) rename plugins/lttng-utils/{ => debug-info}/trace-ir-metadata-copy.c (100%) rename plugins/lttng-utils/{ => debug-info}/trace-ir-metadata-copy.h (100%) rename plugins/lttng-utils/{ => debug-info}/trace-ir-metadata-field-class-copy.c (100%) rename plugins/lttng-utils/{ => debug-info}/trace-ir-metadata-field-class-copy.h (100%) rename plugins/lttng-utils/{ => debug-info}/utils.c (100%) rename plugins/lttng-utils/{ => debug-info}/utils.h (100%) diff --git a/configure.ac b/configure.ac index eba84ee5..45c6548c 100644 --- a/configure.ac +++ b/configure.ac @@ -784,6 +784,7 @@ AC_CONFIG_FILES([ plugins/utils/muxer/Makefile python-plugin-provider/Makefile plugins/lttng-utils/Makefile + plugins/lttng-utils/debug-info/Makefile babeltrace.pc babeltrace-ctf.pc ]) diff --git a/plugins/lttng-utils/Makefile.am b/plugins/lttng-utils/Makefile.am index a090390f..34ff2a64 100644 --- a/plugins/lttng-utils/Makefile.am +++ b/plugins/lttng-utils/Makefile.am @@ -1,37 +1,18 @@ -AM_CPPFLAGS += -I$(top_srcdir)/plugins +SUBDIRS = +if ENABLE_DEBUG_INFO +SUBDIRS += debug-info +endif -noinst_LTLIBRARIES = libdebug-info.la -libdebug_info_la_SOURCES = \ - bin-info.c \ - bin-info.h \ - crc32.c \ - crc32.h \ - debug-info.c \ - debug-info.h \ - dwarf.c \ - dwarf.h \ - trace-ir-data-copy.c \ - trace-ir-data-copy.h \ - trace-ir-mapping.c \ - trace-ir-mapping.h \ - trace-ir-metadata-copy.c \ - trace-ir-metadata-copy.h \ - trace-ir-metadata-field-class-copy.c \ - trace-ir-metadata-field-class-copy.h \ - logging.c \ - logging.h +AM_CPPFLAGS += -I$(top_srcdir)/plugins plugindir = "$(PLUGINSDIR)" plugin_LTLIBRARIES = babeltrace-plugin-lttng-utils.la babeltrace_plugin_lttng_utils_la_SOURCES = \ - plugin.c \ - utils.c \ - utils.h \ - logging.h + plugin.c babeltrace_plugin_lttng_utils_la_LIBADD = \ - libdebug-info.la + debug-info/libdebug-info.la babeltrace_plugin_lttng_utils_la_LDFLAGS = \ $(LT_NO_UNDEFINED) \ diff --git a/plugins/lttng-utils/debug-info/Makefile.am b/plugins/lttng-utils/debug-info/Makefile.am new file mode 100644 index 00000000..f43feac6 --- /dev/null +++ b/plugins/lttng-utils/debug-info/Makefile.am @@ -0,0 +1,24 @@ +AM_CPPFLAGS += -I$(top_srcdir)/plugins + +noinst_LTLIBRARIES = libdebug-info.la +libdebug_info_la_SOURCES = \ + bin-info.c \ + bin-info.h \ + crc32.c \ + crc32.h \ + debug-info.c \ + debug-info.h \ + dwarf.c \ + dwarf.h \ + logging.c \ + logging.h \ + trace-ir-data-copy.c \ + trace-ir-data-copy.h \ + trace-ir-mapping.c \ + trace-ir-mapping.h \ + trace-ir-metadata-copy.c \ + trace-ir-metadata-copy.h \ + trace-ir-metadata-field-class-copy.c \ + trace-ir-metadata-field-class-copy.h \ + utils.c \ + utils.h diff --git a/plugins/lttng-utils/bin-info.c b/plugins/lttng-utils/debug-info/bin-info.c similarity index 100% rename from plugins/lttng-utils/bin-info.c rename to plugins/lttng-utils/debug-info/bin-info.c diff --git a/plugins/lttng-utils/bin-info.h b/plugins/lttng-utils/debug-info/bin-info.h similarity index 100% rename from plugins/lttng-utils/bin-info.h rename to plugins/lttng-utils/debug-info/bin-info.h diff --git a/plugins/lttng-utils/crc32.c b/plugins/lttng-utils/debug-info/crc32.c similarity index 100% rename from plugins/lttng-utils/crc32.c rename to plugins/lttng-utils/debug-info/crc32.c diff --git a/plugins/lttng-utils/crc32.h b/plugins/lttng-utils/debug-info/crc32.h similarity index 100% rename from plugins/lttng-utils/crc32.h rename to plugins/lttng-utils/debug-info/crc32.h diff --git a/plugins/lttng-utils/debug-info.c b/plugins/lttng-utils/debug-info/debug-info.c similarity index 100% rename from plugins/lttng-utils/debug-info.c rename to plugins/lttng-utils/debug-info/debug-info.c diff --git a/plugins/lttng-utils/debug-info.h b/plugins/lttng-utils/debug-info/debug-info.h similarity index 100% rename from plugins/lttng-utils/debug-info.h rename to plugins/lttng-utils/debug-info/debug-info.h diff --git a/plugins/lttng-utils/dwarf.c b/plugins/lttng-utils/debug-info/dwarf.c similarity index 100% rename from plugins/lttng-utils/dwarf.c rename to plugins/lttng-utils/debug-info/dwarf.c diff --git a/plugins/lttng-utils/dwarf.h b/plugins/lttng-utils/debug-info/dwarf.h similarity index 100% rename from plugins/lttng-utils/dwarf.h rename to plugins/lttng-utils/debug-info/dwarf.h diff --git a/plugins/lttng-utils/logging.c b/plugins/lttng-utils/debug-info/logging.c similarity index 100% rename from plugins/lttng-utils/logging.c rename to plugins/lttng-utils/debug-info/logging.c diff --git a/plugins/lttng-utils/logging.h b/plugins/lttng-utils/debug-info/logging.h similarity index 100% rename from plugins/lttng-utils/logging.h rename to plugins/lttng-utils/debug-info/logging.h diff --git a/plugins/lttng-utils/trace-ir-data-copy.c b/plugins/lttng-utils/debug-info/trace-ir-data-copy.c similarity index 100% rename from plugins/lttng-utils/trace-ir-data-copy.c rename to plugins/lttng-utils/debug-info/trace-ir-data-copy.c diff --git a/plugins/lttng-utils/trace-ir-data-copy.h b/plugins/lttng-utils/debug-info/trace-ir-data-copy.h similarity index 100% rename from plugins/lttng-utils/trace-ir-data-copy.h rename to plugins/lttng-utils/debug-info/trace-ir-data-copy.h diff --git a/plugins/lttng-utils/trace-ir-mapping.c b/plugins/lttng-utils/debug-info/trace-ir-mapping.c similarity index 100% rename from plugins/lttng-utils/trace-ir-mapping.c rename to plugins/lttng-utils/debug-info/trace-ir-mapping.c diff --git a/plugins/lttng-utils/trace-ir-mapping.h b/plugins/lttng-utils/debug-info/trace-ir-mapping.h similarity index 100% rename from plugins/lttng-utils/trace-ir-mapping.h rename to plugins/lttng-utils/debug-info/trace-ir-mapping.h diff --git a/plugins/lttng-utils/trace-ir-metadata-copy.c b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c similarity index 100% rename from plugins/lttng-utils/trace-ir-metadata-copy.c rename to plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c diff --git a/plugins/lttng-utils/trace-ir-metadata-copy.h b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.h similarity index 100% rename from plugins/lttng-utils/trace-ir-metadata-copy.h rename to plugins/lttng-utils/debug-info/trace-ir-metadata-copy.h diff --git a/plugins/lttng-utils/trace-ir-metadata-field-class-copy.c b/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c similarity index 100% rename from plugins/lttng-utils/trace-ir-metadata-field-class-copy.c rename to plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c diff --git a/plugins/lttng-utils/trace-ir-metadata-field-class-copy.h b/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.h similarity index 100% rename from plugins/lttng-utils/trace-ir-metadata-field-class-copy.h rename to plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.h diff --git a/plugins/lttng-utils/utils.c b/plugins/lttng-utils/debug-info/utils.c similarity index 100% rename from plugins/lttng-utils/utils.c rename to plugins/lttng-utils/debug-info/utils.c diff --git a/plugins/lttng-utils/utils.h b/plugins/lttng-utils/debug-info/utils.h similarity index 100% rename from plugins/lttng-utils/utils.h rename to plugins/lttng-utils/debug-info/utils.h diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c index 655e30f8..0f100da2 100644 --- a/plugins/lttng-utils/plugin.c +++ b/plugins/lttng-utils/plugin.c @@ -27,7 +27,7 @@ */ #include -#include "debug-info.h" +#include "debug-info/debug-info.h" #ifndef BT_BUILT_IN_PLUGINS BT_PLUGIN_MODULE(); diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index e68d6671..29891787 100644 --- a/tests/plugins/Makefile.am +++ b/tests/plugins/Makefile.am @@ -16,7 +16,7 @@ endif # !ENABLE_BUILT_IN_PLUGINS if ENABLE_DEBUG_INFO test_dwarf_LDADD = \ - $(top_builddir)/plugins/lttng-utils/libdebug-info.la \ + $(top_builddir)/plugins/lttng-utils/debug-info/libdebug-info.la \ $(top_builddir)/logging/libbabeltrace-logging.la \ $(top_builddir)/common/libbabeltrace-common.la \ $(ELFUTILS_LIBS) \ @@ -24,7 +24,7 @@ test_dwarf_LDADD = \ test_dwarf_SOURCES = test_dwarf.c test_bin_info_LDADD = \ - $(top_builddir)/plugins/lttng-utils/libdebug-info.la \ + $(top_builddir)/plugins/lttng-utils/debug-info/libdebug-info.la \ $(top_builddir)/logging/libbabeltrace-logging.la \ $(top_builddir)/common/libbabeltrace-common.la \ $(ELFUTILS_LIBS) \ diff --git a/tests/plugins/test_bin_info.c b/tests/plugins/test_bin_info.c index f95cf0d7..b32f64fa 100644 --- a/tests/plugins/test_bin_info.c +++ b/tests/plugins/test_bin_info.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "tap/tap.h" #define NR_TESTS 36 diff --git a/tests/plugins/test_dwarf.c b/tests/plugins/test_dwarf.c index 8bae3d0b..59a892dd 100644 --- a/tests/plugins/test_dwarf.c +++ b/tests/plugins/test_dwarf.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "tap/tap.h" #define NR_TESTS 15 -- 2.34.1