From c5504f7322f93b32b4bcc65a950ed61efadd694a Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 4 Apr 2017 14:54:09 -0400 Subject: [PATCH] Rename lib/component/ -> lib/graph/ to match include/babeltrace/graph/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- configure.ac | 4 ++-- lib/Makefile.am | 4 ++-- lib/{component => graph}/Makefile.am | 10 +++++----- lib/{component => graph}/clock-class-priority-map.c | 0 lib/{component => graph}/component-class.c | 0 lib/{component => graph}/component.c | 0 lib/{component => graph}/connection.c | 0 lib/{component => graph}/filter.c | 0 lib/{component => graph}/graph.c | 0 lib/{component => graph}/iterator.c | 0 lib/{component => graph}/notification/Makefile.am | 5 ++--- lib/{component => graph}/notification/event.c | 0 lib/{component => graph}/notification/heap.c | 0 lib/{component => graph}/notification/inactivity.c | 0 lib/{component => graph}/notification/notification.c | 0 lib/{component => graph}/notification/packet.c | 0 lib/{component => graph}/notification/stream.c | 0 lib/{component => graph}/port.c | 0 lib/{component => graph}/sink.c | 0 lib/{component => graph}/source.c | 0 20 files changed, 11 insertions(+), 12 deletions(-) rename lib/{component => graph}/Makefile.am (58%) rename lib/{component => graph}/clock-class-priority-map.c (100%) rename lib/{component => graph}/component-class.c (100%) rename lib/{component => graph}/component.c (100%) rename lib/{component => graph}/connection.c (100%) rename lib/{component => graph}/filter.c (100%) rename lib/{component => graph}/graph.c (100%) rename lib/{component => graph}/iterator.c (100%) rename lib/{component => graph}/notification/Makefile.am (53%) rename lib/{component => graph}/notification/event.c (100%) rename lib/{component => graph}/notification/heap.c (100%) rename lib/{component => graph}/notification/inactivity.c (100%) rename lib/{component => graph}/notification/notification.c (100%) rename lib/{component => graph}/notification/packet.c (100%) rename lib/{component => graph}/notification/stream.c (100%) rename lib/{component => graph}/port.c (100%) rename lib/{component => graph}/sink.c (100%) rename lib/{component => graph}/source.c (100%) diff --git a/configure.ac b/configure.ac index c3714659..18335bd5 100644 --- a/configure.ac +++ b/configure.ac @@ -466,8 +466,8 @@ AC_CONFIG_FILES([ lib/Makefile lib/prio_heap/Makefile lib/plugin/Makefile - lib/component/Makefile - lib/component/notification/Makefile + lib/graph/Makefile + lib/graph/notification/Makefile lib/ctf-ir/Makefile lib/ctf-writer/Makefile include/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index 49fff815..068d858e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = ctf-ir ctf-writer prio_heap plugin component . +SUBDIRS = ctf-ir ctf-writer prio_heap plugin graph . AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include @@ -10,7 +10,7 @@ libbabeltrace_la_LDFLAGS = -version-info $(BABELTRACE_LIBRARY_VERSION) libbabeltrace_la_LIBADD = \ prio_heap/libprio_heap.la \ $(top_builddir)/compat/libcompat.la \ - component/libcomponent.la \ + graph/libgraph.la \ plugin/libplugin.la \ $(top_builddir)/common/libbabeltrace-common.la \ ctf-ir/libctf-ir.la \ diff --git a/lib/component/Makefile.am b/lib/graph/Makefile.am similarity index 58% rename from lib/component/Makefile.am rename to lib/graph/Makefile.am index a72766e0..09bb1792 100644 --- a/lib/component/Makefile.am +++ b/lib/graph/Makefile.am @@ -2,10 +2,10 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include SUBDIRS = notification -noinst_LTLIBRARIES = libcomponent.la +noinst_LTLIBRARIES = libgraph.la -# Plug-in system library -libcomponent_la_SOURCES = \ +# Graph library +libgraph_la_SOURCES = \ clock-class-priority-map.c \ component.c \ component-class.c \ @@ -17,5 +17,5 @@ libcomponent_la_SOURCES = \ filter.c \ iterator.c -libcomponent_la_LIBADD = \ - notification/libcomponent-notification.la +libgraph_la_LIBADD = \ + notification/libgraph-notification.la diff --git a/lib/component/clock-class-priority-map.c b/lib/graph/clock-class-priority-map.c similarity index 100% rename from lib/component/clock-class-priority-map.c rename to lib/graph/clock-class-priority-map.c diff --git a/lib/component/component-class.c b/lib/graph/component-class.c similarity index 100% rename from lib/component/component-class.c rename to lib/graph/component-class.c diff --git a/lib/component/component.c b/lib/graph/component.c similarity index 100% rename from lib/component/component.c rename to lib/graph/component.c diff --git a/lib/component/connection.c b/lib/graph/connection.c similarity index 100% rename from lib/component/connection.c rename to lib/graph/connection.c diff --git a/lib/component/filter.c b/lib/graph/filter.c similarity index 100% rename from lib/component/filter.c rename to lib/graph/filter.c diff --git a/lib/component/graph.c b/lib/graph/graph.c similarity index 100% rename from lib/component/graph.c rename to lib/graph/graph.c diff --git a/lib/component/iterator.c b/lib/graph/iterator.c similarity index 100% rename from lib/component/iterator.c rename to lib/graph/iterator.c diff --git a/lib/component/notification/Makefile.am b/lib/graph/notification/Makefile.am similarity index 53% rename from lib/component/notification/Makefile.am rename to lib/graph/notification/Makefile.am index 1b08e684..db32a43c 100644 --- a/lib/component/notification/Makefile.am +++ b/lib/graph/notification/Makefile.am @@ -1,9 +1,8 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -noinst_LTLIBRARIES = libcomponent-notification.la +noinst_LTLIBRARIES = libgraph-notification.la -# Plug-in system library -libcomponent_notification_la_SOURCES = \ +libgraph_notification_la_SOURCES = \ notification.c \ packet.c \ event.c \ diff --git a/lib/component/notification/event.c b/lib/graph/notification/event.c similarity index 100% rename from lib/component/notification/event.c rename to lib/graph/notification/event.c diff --git a/lib/component/notification/heap.c b/lib/graph/notification/heap.c similarity index 100% rename from lib/component/notification/heap.c rename to lib/graph/notification/heap.c diff --git a/lib/component/notification/inactivity.c b/lib/graph/notification/inactivity.c similarity index 100% rename from lib/component/notification/inactivity.c rename to lib/graph/notification/inactivity.c diff --git a/lib/component/notification/notification.c b/lib/graph/notification/notification.c similarity index 100% rename from lib/component/notification/notification.c rename to lib/graph/notification/notification.c diff --git a/lib/component/notification/packet.c b/lib/graph/notification/packet.c similarity index 100% rename from lib/component/notification/packet.c rename to lib/graph/notification/packet.c diff --git a/lib/component/notification/stream.c b/lib/graph/notification/stream.c similarity index 100% rename from lib/component/notification/stream.c rename to lib/graph/notification/stream.c diff --git a/lib/component/port.c b/lib/graph/port.c similarity index 100% rename from lib/component/port.c rename to lib/graph/port.c diff --git a/lib/component/sink.c b/lib/graph/sink.c similarity index 100% rename from lib/component/sink.c rename to lib/graph/sink.c diff --git a/lib/component/source.c b/lib/graph/source.c similarity index 100% rename from lib/component/source.c rename to lib/graph/source.c -- 2.34.1