Config/build/install vg_annotate and vg_cachegen correctly.

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

diff --git a/Makefile.am b/Makefile.am
index fcbfae9b57a563cf826b343a7db7ee073eec6f14..7086d48297d1d31b50ee45dbd568d8887aeb5a33 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,10 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 
-vg_annotate:
-
-vg_cachegen:
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 

diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index fcbfae9b57a563cf826b343a7db7ee073eec6f14..7086d48297d1d31b50ee45dbd568d8887aeb5a33 100644 (file)
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -80,10 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 
-vg_annotate:
-
-vg_cachegen:
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 

diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index fcbfae9b57a563cf826b343a7db7ee073eec6f14..7086d48297d1d31b50ee45dbd568d8887aeb5a33 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -80,10 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 
-vg_annotate:
-
-vg_cachegen:
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 

diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
index b3b091cc234e6bcf1c7e606597e2bb4edab7dd95..b09cc3456385c0746e33b09ae4dd6855e9fe580a 100644 (file)
--- a/cachegrind/cg_annotate.in
+++ b/cachegrind/cg_annotate.in
@@ -217,7 +217,7 @@ sub process_cmd_line()
 
             # --version
             if ($arg =~ /^-v$|^--version$/) {
-                die("vg_annotate$version\n");
+                die("vg_annotate-$version\n");
 
             # --show=A,B,C
             } elsif ($arg =~ /^--show=(.*)$/) {

diff --git a/configure.in b/configure.in
index b90d750dbc85d73f5a5077d584976fd00b5923c3..e1bb3f84bbaeb6efba54bf18f9f85bac218f9215 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -247,6 +247,8 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([floor memchr memset mkdir strchr strdup strpbrk strrchr strstr])
 
 AC_OUTPUT(
+   vg_annotate
+   vg_cachegen
    valgrind
    valgrind.spec
    Makefile 

diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am
index fcbfae9b57a563cf826b343a7db7ee073eec6f14..7086d48297d1d31b50ee45dbd568d8887aeb5a33 100644 (file)
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -80,10 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 
-vg_annotate:
-
-vg_cachegen:
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index fcbfae9b57a563cf826b343a7db7ee073eec6f14..7086d48297d1d31b50ee45dbd568d8887aeb5a33 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -80,10 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 
-vg_annotate:
-
-vg_cachegen:
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 

diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index fcbfae9b57a563cf826b343a7db7ee073eec6f14..7086d48297d1d31b50ee45dbd568d8887aeb5a33 100644 (file)
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -80,10 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 
-vg_annotate:
-
-vg_cachegen:
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 

diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index fcbfae9b57a563cf826b343a7db7ee073eec6f14..7086d48297d1d31b50ee45dbd568d8887aeb5a33 100644 (file)
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -80,10 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 
-vg_annotate:
-
-vg_cachegen:
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index fcbfae9b57a563cf826b343a7db7ee073eec6f14..7086d48297d1d31b50ee45dbd568d8887aeb5a33 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -80,10 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 
-vg_annotate:
-
-vg_cachegen:
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 

diff --git a/none/Makefile.am b/none/Makefile.am
index fcbfae9b57a563cf826b343a7db7ee073eec6f14..7086d48297d1d31b50ee45dbd568d8887aeb5a33 100644 (file)
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -80,10 +80,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 
-vg_annotate:
-
-vg_cachegen:
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
        $(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 

diff --git a/vg_annotate.in b/vg_annotate.in
index b3b091cc234e6bcf1c7e606597e2bb4edab7dd95..b09cc3456385c0746e33b09ae4dd6855e9fe580a 100644 (file)
--- a/vg_annotate.in
+++ b/vg_annotate.in
@@ -217,7 +217,7 @@ sub process_cmd_line()
 
             # --version
             if ($arg =~ /^-v$|^--version$/) {
-                die("vg_annotate$version\n");
+                die("vg_annotate-$version\n");
 
             # --show=A,B,C
             } elsif ($arg =~ /^--show=(.*)$/) {