From 15612a0fc0d9e9fc8a6f2f9339f209e8a51e6b0c Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 16 Jun 2011 15:24:23 -0400 Subject: [PATCH] More removal Signed-off-by: Mathieu Desnoyers --- Makefile.am | 5 ++++- configure.ac | 2 +- {libust => deprecated/libust}/channels.c | 0 {libust => deprecated/libust}/channels.h | 0 .../libust}/marker-control.c | 0 .../libust}/marker-control.h | 0 {libust => deprecated/libust}/marker.c | 0 {libust => deprecated/libust}/serialize.c | 0 {libust => deprecated/libust}/tracectl.c | 0 {libust => deprecated/libust}/tracer.c | 0 .../libust}/type-serializer.c | 0 .../libust}/type-serializer.h | 0 libust/Makefile.am | 21 +++++-------------- 13 files changed, 10 insertions(+), 18 deletions(-) rename {libust => deprecated/libust}/channels.c (100%) rename {libust => deprecated/libust}/channels.h (100%) rename {libust => deprecated/libust}/marker-control.c (100%) rename {libust => deprecated/libust}/marker-control.h (100%) rename {libust => deprecated/libust}/marker.c (100%) rename {libust => deprecated/libust}/serialize.c (100%) rename {libust => deprecated/libust}/tracectl.c (100%) rename {libust => deprecated/libust}/tracer.c (100%) rename {libust => deprecated/libust}/type-serializer.c (100%) rename {libust => deprecated/libust}/type-serializer.h (100%) diff --git a/Makefile.am b/Makefile.am index 0a9cde64..fe0bbaa3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,10 @@ ACLOCAL_AMFLAGS = -I config # libust and '.' (that contains the linker script). However, '.' # must be installed after libust so it can overwrite libust.so with # the linker script. -SUBDIRS = snprintf libust . tests libustinstr-malloc libustfork include doc +SUBDIRS = snprintf libust include doc + +#temporarily disabled +# . tests libustinstr-malloc libustfork EXTRA_DIST = libust.ldscript.in libust-initializer.c libust-initializer.h diff --git a/configure.ac b/configure.ac index 8594a470..6ab6e3c2 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([config]) AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_CONFIG_SRCDIR([ustctl/ustctl.c]) +AC_CONFIG_SRCDIR([include/ust/tracepoint.h]) AC_CONFIG_HEADERS([config.h include/ust/config.h]) AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.]) # Compute minor/major version numbers diff --git a/libust/channels.c b/deprecated/libust/channels.c similarity index 100% rename from libust/channels.c rename to deprecated/libust/channels.c diff --git a/libust/channels.h b/deprecated/libust/channels.h similarity index 100% rename from libust/channels.h rename to deprecated/libust/channels.h diff --git a/libust/marker-control.c b/deprecated/libust/marker-control.c similarity index 100% rename from libust/marker-control.c rename to deprecated/libust/marker-control.c diff --git a/libust/marker-control.h b/deprecated/libust/marker-control.h similarity index 100% rename from libust/marker-control.h rename to deprecated/libust/marker-control.h diff --git a/libust/marker.c b/deprecated/libust/marker.c similarity index 100% rename from libust/marker.c rename to deprecated/libust/marker.c diff --git a/libust/serialize.c b/deprecated/libust/serialize.c similarity index 100% rename from libust/serialize.c rename to deprecated/libust/serialize.c diff --git a/libust/tracectl.c b/deprecated/libust/tracectl.c similarity index 100% rename from libust/tracectl.c rename to deprecated/libust/tracectl.c diff --git a/libust/tracer.c b/deprecated/libust/tracer.c similarity index 100% rename from libust/tracer.c rename to deprecated/libust/tracer.c diff --git a/libust/type-serializer.c b/deprecated/libust/type-serializer.c similarity index 100% rename from libust/type-serializer.c rename to deprecated/libust/type-serializer.c diff --git a/libust/type-serializer.h b/deprecated/libust/type-serializer.h similarity index 100% rename from libust/type-serializer.h rename to deprecated/libust/type-serializer.h diff --git a/libust/Makefile.am b/libust/Makefile.am index 44addf0d..960ef2a3 100644 --- a/libust/Makefile.am +++ b/libust/Makefile.am @@ -1,34 +1,23 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libustcomm +AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = -fno-strict-aliasing lib_LTLIBRARIES = libust.la libust_la_SOURCES = \ - marker.c \ tracepoint.c \ trace_event.c \ - channels.c \ - channels.h \ - marker-control.c \ - marker-control.h \ - buffers.c \ - buffers.h \ - tracer.c \ tracer.h \ tracercore.c \ tracercore.h \ - serialize.c \ - tracectl.c \ - tracerconst.h \ - type-serializer.h \ - type-serializer.c + tracerconst.h + +#removed: buffers.c buffers.h libust_la_LDFLAGS = -no-undefined -version-info 0:0:0 libust_la_LIBADD = \ -lpthread \ -lrt \ - $(top_builddir)/snprintf/libustsnprintf.la \ - $(top_builddir)/libustcomm/libustcomm.la + $(top_builddir)/snprintf/libustsnprintf.la libust_la_CFLAGS = -DUST_COMPONENT="libust" -fno-strict-aliasing -- 2.34.1