Changed name of tool shared objects from vgskin_XXX.so to vgtool_XXX.so.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3054

diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index 9f04de2f94d3018fd56d5b544660aa538e53ad1e..e49f5faac147fa340fafa4269a2ef8a3a8b82567 100644 (file)
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -3,11 +3,11 @@ include $(top_srcdir)/Makefile.tool.am
 # 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 9d658d54e2540e8a01d40d61e44245fefc7a9792..4064deef3f89f2266c907ff51a0c74d92808a832 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -13,9 +13,9 @@ EXTRA_DIST = cg_sim.c
 
 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 9e4c37b7d036328bb6b978ae348f4fa95cc60fca..d67874b3bcc8fbc75d4cce958da085ab01295433 100644 (file)
--- 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 70752d82aa229e497ad1010a89b9d619abd40823..48562b15d0ffa5d27928befaf88f5a4b39ea1866 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1205,9 +1205,9 @@ static void list_tools(void)
    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 @@ static void load_tool( const char *toolname, void** handle_out,
       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 96c379e7ed62ef9ddcebf7a13724bd39bf7336b4..a9593916cc7527e993cc807b342ae380e39d863c 100644 (file)
--- 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 a21574b9e4d014b17f2b38e8c81da26287125f0b..485ca0169b88a7bf5de58fa5660d155dceed86f8 100644 (file)
--- 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 3dcf96f78ff03184045dd185289106bd9537e8b2..468794dac3f965894d2997ca7bac1d5f27f1454f 100644 (file)
--- a/massif/Makefile.am
+++ b/massif/Makefile.am
@@ -2,10 +2,10 @@ include $(top_srcdir)/Makefile.tool.am
 
 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 9fa2473522a1067ab98188291ed4d828e10977cc..0531225b645c3ed9ec86fff4c2ac8ecd00ec6f4a 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.tool.am
 ## 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 @@ vgpreload_memcheck_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst \
        $(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 @@ vgskin_memcheck_so_SOURCES = \
        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 a4fc9e6fafb7b56ea3c8b1834c6e07851cd0bd5a..ee3c16d8fcf3432b7f9e17889b8ea1dae9d3e9e5 100644 (file)
--- 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