From 55ad629d916dc8a9e0e8859bd469815dc9ec6ceb Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Mon, 5 Oct 2009 16:15:32 -0400 Subject: [PATCH] rename ust -> ustctl --- Makefile.am | 2 +- README | 2 +- configure.ac | 4 ++-- ust/Makefile.am | 8 -------- ust/README | 3 --- ustctl/Makefile.am | 8 ++++++++ ustctl/README | 3 +++ ust/ust.c => ustctl/ustctl.c | 0 8 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 ust/Makefile.am delete mode 100644 ust/README create mode 100644 ustctl/Makefile.am create mode 100644 ustctl/README rename ust/ust.c => ustctl/ustctl.c (100%) diff --git a/Makefile.am b/Makefile.am index 2d6c23b6..33be5b49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libust tests libmallocwrap ustd ust libinterfork +SUBDIRS = libust tests libmallocwrap ustd ustctl libinterfork EXTRA_DIST = share/kernelcompat.h doc bin_SCRIPTS = usttrace diff --git a/README b/README index 71ad996f..1b86fb20 100644 --- a/README +++ b/README @@ -28,7 +28,7 @@ Package contents: The actual userspace tracing library that must be linked to the instrumented programs. -- ust +- ustctl A program to control the tracing of userspace applications. It can list markers, start the tracing, stop the tracing, enable/disable markers, etc. diff --git a/configure.ac b/configure.ac index 9bf9c2ce..bc8c325e 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_INIT([ust], [0.0], [pierre-marc dot fournier at polymtl dot ca]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([0.0 foreign dist-bzip2 no-dist-gzip]) -AC_CONFIG_SRCDIR([ust/ust.c]) +AC_CONFIG_SRCDIR([ustctl/ustctl.c]) AC_CONFIG_HEADERS([config.h]) # Checks for programs. @@ -87,7 +87,7 @@ AC_CONFIG_FILES([ libmallocwrap/Makefile libinterfork/Makefile ustd/Makefile - ust/Makefile + ustctl/Makefile java/Makefile ]) AC_OUTPUT diff --git a/ust/Makefile.am b/ust/Makefile.am deleted file mode 100644 index dcd23a84..00000000 --- a/ust/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -bin_PROGRAMS = ust -ust_SOURCES = ust.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h $(top_builddir)/share/usterr.h -ust_CFLAGS = -DUST_COMPONENT=ust - -INCLUDES = $(KCOMPAT_CFLAGS) -INCLUDES += -I$(top_builddir)/libustcomm -INCLUDES += -I$(top_builddir)/libustcmd -INCLUDES += -I$(top_builddir)/share diff --git a/ust/README b/ust/README deleted file mode 100644 index 69e513b0..00000000 --- a/ust/README +++ /dev/null @@ -1,3 +0,0 @@ -ust is a helper application used to control tracing on programs that support tracing. - -It can list markers, enable/disable markers, start tracing and stop tracing. diff --git a/ustctl/Makefile.am b/ustctl/Makefile.am new file mode 100644 index 00000000..7ceca548 --- /dev/null +++ b/ustctl/Makefile.am @@ -0,0 +1,8 @@ +bin_PROGRAMS = ustctl +ustctl_SOURCES = ustctl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h $(top_builddir)/share/usterr.h +ustctl_CFLAGS = -DUST_COMPONENT=ust + +INCLUDES = $(KCOMPAT_CFLAGS) +INCLUDES += -I$(top_builddir)/libustcomm +INCLUDES += -I$(top_builddir)/libustcmd +INCLUDES += -I$(top_builddir)/share diff --git a/ustctl/README b/ustctl/README new file mode 100644 index 00000000..3fdfbbda --- /dev/null +++ b/ustctl/README @@ -0,0 +1,3 @@ +ustctl is a helper application used to control tracing on programs that support tracing. + +It can list markers, enable/disable markers, start tracing and stop tracing. diff --git a/ust/ust.c b/ustctl/ustctl.c similarity index 100% rename from ust/ust.c rename to ustctl/ustctl.c -- 2.34.1