From d169a27dd79a872d5c44f0547a2bb33bb8402b80 Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Wed, 17 Mar 2010 13:49:09 -0400 Subject: [PATCH] rename libmallocwrap -> libustinstr-malloc --- Makefile.am | 2 +- configure.ac | 2 +- libmallocwrap/Makefile.am | 8 -------- libustinstr-malloc/Makefile.am | 8 ++++++++ {libmallocwrap => libustinstr-malloc}/README | 0 {libmallocwrap => libustinstr-malloc}/mallocwrap.c | 0 {libmallocwrap => libustinstr-malloc}/run | 0 usttrace | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 libmallocwrap/Makefile.am create mode 100644 libustinstr-malloc/Makefile.am rename {libmallocwrap => libustinstr-malloc}/README (100%) rename {libmallocwrap => libustinstr-malloc}/mallocwrap.c (100%) rename {libmallocwrap => libustinstr-malloc}/run (100%) diff --git a/Makefile.am b/Makefile.am index e2d131a8..112e8ebf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 # 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 libustcomm libust . tests libmallocwrap ustd ustctl libustfork include +SUBDIRS = snprintf libustcomm libust . tests libustinstr-malloc ustd ustctl libustfork include EXTRA_DIST = doc libust.ldscript.in libust-initializer.c dist_bin_SCRIPTS = usttrace diff --git a/configure.ac b/configure.ac index 908f5478..1092d254 100644 --- a/configure.ac +++ b/configure.ac @@ -117,7 +117,7 @@ AC_CONFIG_FILES([ tests/snprintf/Makefile tests/test-nevents/Makefile tests/test-libmallocwrap/Makefile - libmallocwrap/Makefile + libustinstr-malloc/Makefile libustfork/Makefile ustd/Makefile ustctl/Makefile diff --git a/libmallocwrap/Makefile.am b/libmallocwrap/Makefile.am deleted file mode 100644 index a98fe351..00000000 --- a/libmallocwrap/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include - -lib_LTLIBRARIES = libmallocwrap.la -libmallocwrap_la_SOURCES = mallocwrap.c -libmallocwrap_la_LIBADD = -ldl - -noinst_SCRIPTS = run -EXTRA_DIST = run diff --git a/libustinstr-malloc/Makefile.am b/libustinstr-malloc/Makefile.am new file mode 100644 index 00000000..0f9007aa --- /dev/null +++ b/libustinstr-malloc/Makefile.am @@ -0,0 +1,8 @@ +AM_CPPFLAGS = -I$(top_srcdir)/include + +lib_LTLIBRARIES = libustinstr-malloc.la +libustinstr_malloc_la_SOURCES = mallocwrap.c +libustinstr_malloc_la_LIBADD = -ldl + +noinst_SCRIPTS = run +EXTRA_DIST = run diff --git a/libmallocwrap/README b/libustinstr-malloc/README similarity index 100% rename from libmallocwrap/README rename to libustinstr-malloc/README diff --git a/libmallocwrap/mallocwrap.c b/libustinstr-malloc/mallocwrap.c similarity index 100% rename from libmallocwrap/mallocwrap.c rename to libustinstr-malloc/mallocwrap.c diff --git a/libmallocwrap/run b/libustinstr-malloc/run similarity index 100% rename from libmallocwrap/run rename to libustinstr-malloc/run diff --git a/usttrace b/usttrace index 0d2a68ae..6ffc988c 100755 --- a/usttrace +++ b/usttrace @@ -28,7 +28,7 @@ if [ -x "${USTTRACE_DIR}/ustd/ustd" ] ; then # Use the not installed libraries instead USTD="${USTTRACE_DIR}/ustd/ustd" LIBINTERFORK_PATH="${USTTRACE_DIR}/libustfork/.libs/libustfork.so" - LIBMALLOCWRAP_PATH="${USTTRACE_DIR}/libmallocwrap/.libs/libmallocwrap.so" + LIBMALLOCWRAP_PATH="${USTTRACE_DIR}/libustinstr-malloc/.libs/libustinstr-malloc.so" LIBUST_PATH="${USTTRACE_DIR}/libust/.libs/libust.so" else # Use the libraries that the dynamic link finds @@ -38,7 +38,7 @@ else exit 1 fi LIBINTERFORK_PATH="libustfork.so" - LIBMALLOCWRAP_PATH="libmallocwrap.so" + LIBMALLOCWRAP_PATH="libustinstr-malloc.so" LIBUST_PATH="libust.so.0" fi -- 2.34.1