From 476037d9a24fdd5e339e3565743aadb9cb8a0a96 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 8 Feb 2012 17:44:19 -0500 Subject: [PATCH] Rename liblttng-ust-libc to liblttng-ust-libc-wrapper What a beautiful piece of code we can find in python: /usr/lib/python2.6/ctypes/util.py: def _findLib_gcc(name): expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name) Basically, this match any library having "libc.so" in its name. It should be reported to python developers as a bug, but let's not be the first to trigger the issue in the wild. Signed-off-by: Mathieu Desnoyers --- Makefile.am | 2 +- README | 2 +- configure.ac | 2 +- .../Makefile.am | 6 +++--- {liblttng-ust-libc => liblttng-ust-libc-wrapper}/README | 0 .../lttng-ust-malloc.c | 0 {liblttng-ust-libc => liblttng-ust-libc-wrapper}/run | 0 {liblttng-ust-libc => liblttng-ust-libc-wrapper}/ust_libc.h | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename {liblttng-ust-libc => liblttng-ust-libc-wrapper}/Makefile.am (59%) rename {liblttng-ust-libc => liblttng-ust-libc-wrapper}/README (100%) rename {liblttng-ust-libc => liblttng-ust-libc-wrapper}/lttng-ust-malloc.c (100%) rename {liblttng-ust-libc => liblttng-ust-libc-wrapper}/run (100%) rename {liblttng-ust-libc => liblttng-ust-libc-wrapper}/ust_libc.h (100%) diff --git a/Makefile.am b/Makefile.am index 98a38810..8aff58db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \ liblttng-ust \ liblttng-ust-ctl \ liblttng-ust-fork \ - liblttng-ust-libc \ + liblttng-ust-libc-wrapper \ tests if BUILD_JNI_INTERFACE diff --git a/README b/README index 45521d00..e2b52aa0 100644 --- a/README +++ b/README @@ -144,7 +144,7 @@ PACKAGE CONTENTS: - tests Various test programs - - liblttng-ust-libc + - liblttng-ust-libc-wrapper An example library that can be LD_PRELOAD'ed to instrument some calls to libc (currently malloc() and free()) in any program without need to recompile it. diff --git a/configure.ac b/configure.ac index 67756c4f..10b66914 100644 --- a/configure.ac +++ b/configure.ac @@ -234,7 +234,7 @@ AC_CONFIG_FILES([ liblttng-ust-ctl/Makefile liblttng-ust-fork/Makefile liblttng-ust-java/Makefile - liblttng-ust-libc/Makefile + liblttng-ust-libc-wrapper/Makefile tests/Makefile tests/hello/Makefile tests/hello-static-lib/Makefile diff --git a/liblttng-ust-libc/Makefile.am b/liblttng-ust-libc-wrapper/Makefile.am similarity index 59% rename from liblttng-ust-libc/Makefile.am rename to liblttng-ust-libc-wrapper/Makefile.am index 99d8ed93..6220f76c 100644 --- a/liblttng-ust-libc/Makefile.am +++ b/liblttng-ust-libc-wrapper/Makefile.am @@ -1,11 +1,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = -fno-strict-aliasing -lib_LTLIBRARIES = liblttng-ust-libc.la -liblttng_ust_libc_la_SOURCES = \ +lib_LTLIBRARIES = liblttng-ust-libc-wrapper.la +liblttng_ust_libc_wrapper_la_SOURCES = \ lttng-ust-malloc.c \ ust_libc.h -liblttng_ust_libc_la_LIBADD = -ldl \ +liblttng_ust_libc_wrapper_la_LIBADD = -ldl \ -L$(top_builddir)/liblttng-ust/.libs \ -llttng-ust diff --git a/liblttng-ust-libc/README b/liblttng-ust-libc-wrapper/README similarity index 100% rename from liblttng-ust-libc/README rename to liblttng-ust-libc-wrapper/README diff --git a/liblttng-ust-libc/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c similarity index 100% rename from liblttng-ust-libc/lttng-ust-malloc.c rename to liblttng-ust-libc-wrapper/lttng-ust-malloc.c diff --git a/liblttng-ust-libc/run b/liblttng-ust-libc-wrapper/run similarity index 100% rename from liblttng-ust-libc/run rename to liblttng-ust-libc-wrapper/run diff --git a/liblttng-ust-libc/ust_libc.h b/liblttng-ust-libc-wrapper/ust_libc.h similarity index 100% rename from liblttng-ust-libc/ust_libc.h rename to liblttng-ust-libc-wrapper/ust_libc.h -- 2.34.1