Changed name of tool shared objects from vgskin_XXX.so to vgtool_XXX.so.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3054 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index 9f04de2..e49f5fa 100644
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -3,11 +3,11 @@
# include memcheck/ for mac_shared.h
AM_CPPFLAGS += -I$(top_srcdir)/memcheck
-val_PROGRAMS = vgskin_addrcheck.so vgpreload_addrcheck.so
+val_PROGRAMS = vgtool_addrcheck.so vgpreload_addrcheck.so
-vgskin_addrcheck_so_SOURCES = ac_main.c
-vgskin_addrcheck_so_LDFLAGS = -shared
-vgskin_addrcheck_so_LDADD = \
+vgtool_addrcheck_so_SOURCES = ac_main.c
+vgtool_addrcheck_so_LDFLAGS = -shared
+vgtool_addrcheck_so_LDADD = \
../memcheck/mac_leakcheck.o \
../memcheck/mac_malloc_wrappers.o \
../memcheck/mac_needs.o
diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index 9d658d5..4064dee 100644
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -13,9 +13,9 @@
noinst_HEADERS = cg_arch.h
-val_PROGRAMS = vgskin_cachegrind.so
+val_PROGRAMS = vgtool_cachegrind.so
-vgskin_cachegrind_so_SOURCES = cg_main.c
-vgskin_cachegrind_so_LDFLAGS = -shared
-vgskin_cachegrind_so_LDADD = ${VG_ARCH}/libcgarch.a
+vgtool_cachegrind_so_SOURCES = cg_main.c
+vgtool_cachegrind_so_LDFLAGS = -shared
+vgtool_cachegrind_so_LDADD = ${VG_ARCH}/libcgarch.a
diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am
index 9e4c37b..d67874b 100644
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/Makefile.tool.am
-val_PROGRAMS = vgskin_corecheck.so
+val_PROGRAMS = vgtool_corecheck.so
-vgskin_corecheck_so_SOURCES = cc_main.c
-vgskin_corecheck_so_LDFLAGS = -shared
+vgtool_corecheck_so_SOURCES = cc_main.c
+vgtool_corecheck_so_LDFLAGS = -shared
diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 70752d8..48562b1 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1205,9 +1205,9 @@
while ((de = readdir(dir)) != NULL) {
int len = strlen(de->d_name);
- /* look for vgskin_TOOL.so names */
- if (len > (7+1+3) && /* "vgskin_" + at least 1-char toolname + ".so" */
- strncmp(de->d_name, "vgskin_", 7) == 0 &&
+ /* look for vgtool_TOOL.so names */
+ if (len > (7+1+3) && /* "vgtool_" + at least 1-char toolname + ".so" */
+ strncmp(de->d_name, "vgtool_", 7) == 0 &&
VG_STREQ(de->d_name + len - 3, ".so")) {
if (first) {
fprintf(stderr, "Available tools:\n");
@@ -1247,7 +1247,7 @@
handle = dlopen(toolname, RTLD_NOW);
} else {
/* just try in the libdir */
- snprintf(buf, len, "%s/vgskin_%s.so", VG_(libdir), toolname);
+ snprintf(buf, len, "%s/vgtool_%s.so", VG_(libdir), toolname);
handle = dlopen(buf, RTLD_NOW);
if (handle != NULL) {
diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index 96c379e..a959391 100644
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -1,9 +1,9 @@
include $(top_srcdir)/Makefile.tool.am
-val_PROGRAMS = vgskin_helgrind.so vgpreload_helgrind.so
+val_PROGRAMS = vgtool_helgrind.so vgpreload_helgrind.so
-vgskin_helgrind_so_SOURCES = hg_main.c
-vgskin_helgrind_so_LDFLAGS = -shared
+vgtool_helgrind_so_SOURCES = hg_main.c
+vgtool_helgrind_so_LDFLAGS = -shared
vgpreload_helgrind_so_SOURCES =
vgpreload_helgrind_so_DEPENDENCIES = $(top_builddir)/coregrind/lib_replace_malloc.a
diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index a21574b..485ca01 100644
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/Makefile.tool.am
-val_PROGRAMS = vgskin_lackey.so
+val_PROGRAMS = vgtool_lackey.so
-vgskin_lackey_so_SOURCES = lk_main.c
-vgskin_lackey_so_LDFLAGS = -shared
+vgtool_lackey_so_SOURCES = lk_main.c
+vgtool_lackey_so_LDFLAGS = -shared
diff --git a/massif/Makefile.am b/massif/Makefile.am
index 3dcf96f..468794d 100644
--- a/massif/Makefile.am
+++ b/massif/Makefile.am
@@ -2,10 +2,10 @@
SUBDIRS += hp2ps
-val_PROGRAMS = vgskin_massif.so vgpreload_massif.so
+val_PROGRAMS = vgtool_massif.so vgpreload_massif.so
-vgskin_massif_so_SOURCES = ms_main.c
-vgskin_massif_so_LDFLAGS = -shared
+vgtool_massif_so_SOURCES = ms_main.c
+vgtool_massif_so_LDFLAGS = -shared
vgpreload_massif_so_SOURCES =
vgpreload_massif_so_DEPENDENCIES = $(top_builddir)/coregrind/lib_replace_malloc.a
diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index 9fa2473..0531225 100644
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -3,7 +3,7 @@
## Build Memcheck at a higher optimisation level
AM_CFLAGS += -O2
-val_PROGRAMS = vgskin_memcheck.so vgpreload_memcheck.so
+val_PROGRAMS = vgtool_memcheck.so vgpreload_memcheck.so
vgpreload_memcheck_so_SOURCES = \
mac_replace_strmem.c
@@ -13,7 +13,7 @@
$(top_builddir)/coregrind/lib_replace_malloc.a \
-Wl,--no-whole-archive
-vgskin_memcheck_so_SOURCES = \
+vgtool_memcheck_so_SOURCES = \
mac_leakcheck.c \
mac_malloc_wrappers.c \
mac_needs.c \
@@ -22,7 +22,7 @@
mc_from_ucode.c \
mc_translate.c \
mc_helpers.S
-vgskin_memcheck_so_LDFLAGS = -shared
+vgtool_memcheck_so_LDFLAGS = -shared
mcincludedir = $(includedir)/valgrind
diff --git a/none/Makefile.am b/none/Makefile.am
index a4fc9e6..ee3c16d 100644
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/Makefile.tool.am
-val_PROGRAMS = vgskin_none.so
+val_PROGRAMS = vgtool_none.so
-vgskin_none_so_SOURCES = nl_main.c
-vgskin_none_so_LDFLAGS = -shared
+vgtool_none_so_SOURCES = nl_main.c
+vgtool_none_so_LDFLAGS = -shared