Config/build/install vg_annotate and vg_cachegen correctly.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@169 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index fcbfae9..7086d48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,10 +80,6 @@
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 fcbfae9..7086d48 100644
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -80,10 +80,6 @@
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 fcbfae9..7086d48 100644
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -80,10 +80,6 @@
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 b3b091c..b09cc34 100644
--- a/cachegrind/cg_annotate.in
+++ b/cachegrind/cg_annotate.in
@@ -217,7 +217,7 @@
# --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 b90d750..e1bb3f8 100644
--- a/configure.in
+++ b/configure.in
@@ -247,6 +247,8 @@
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 fcbfae9..7086d48 100644
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -80,10 +80,6 @@
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 fcbfae9..7086d48 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -80,10 +80,6 @@
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 fcbfae9..7086d48 100644
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -80,10 +80,6 @@
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 fcbfae9..7086d48 100644
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -80,10 +80,6 @@
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 fcbfae9..7086d48 100644
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -80,10 +80,6 @@
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 fcbfae9..7086d48 100644
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -80,10 +80,6 @@
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 b3b091c..b09cc34 100644
--- a/vg_annotate.in
+++ b/vg_annotate.in
@@ -217,7 +217,7 @@
# --version
if ($arg =~ /^-v$|^--version$/) {
- die("vg_annotate$version\n");
+ die("vg_annotate-$version\n");
# --show=A,B,C
} elsif ($arg =~ /^--show=(.*)$/) {