reapply automake fixes. make check will now generate the binaries which
are only required for regression testing.

If this breaks something, please mail me first instead of reverting.
Thank you.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1530 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 816c452..d2d507f 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -57,7 +57,7 @@
 	tronical.stderr.exp tronical.vgtest \
 	weirdioctl.stderr.exp weirdioctl.stdout.exp weirdioctl.vgtest
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
 	badaddrvalue badfree badjump badloop buflen_check clientperm \
 	doublefree errs1 exitprog fprw fwrite inits inline \
 	malloc1 malloc2 malloc3 manuel1 manuel2 manuel3 \
@@ -66,8 +66,8 @@
 	trivialleak tronical weirdioctl	\
 	mismatches new_override
 
-CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g 
-CXXFLAGS = $(CFLAGS)
+AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g 
+AM_CXXFLAGS = $(AM_CFLAGS)
 INCLUDES = -I$(top_srcdir)/include
 
 # C ones