fix make distcheck with newer automake
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1443 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index b63b452..df2e57e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
lackey \
none
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
@@ -19,6 +19,8 @@
BUILT_SOURCES = default.supp
+CLEANFILES = default.supp
+
default.supp: $(SUPP_FILES)
bzdist: dist
diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index 596e9da..5ba2f78 100644
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -4,7 +4,7 @@
# include memcheck/ for mc_common.{c,h}
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/memcheck
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
diff --git a/auxprogs/.cvsignore b/auxprogs/.cvsignore
new file mode 100644
index 0000000..7862125
--- /dev/null
+++ b/auxprogs/.cvsignore
@@ -0,0 +1,3 @@
+Makefile.in
+Makefile
+valgrind-listener
diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index 23df8e8..ad6aa9f 100644
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -3,7 +3,7 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/coregrind
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -O -g
bin_PROGRAMS = valgrind-listener
diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index a877e33..ef494bb 100644
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -3,7 +3,7 @@
INCLUDES = -I$(top_srcdir)/include
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
@@ -14,8 +14,7 @@
cg_sim_I1.c \
cg_sim_D1.c \
cg_sim_L2.c \
- cg_sim_gen.c \
- tests
+ cg_sim_gen.c
val_PROGRAMS = vgskin_cachegrind.so
diff --git a/cachegrind/tests/Makefile.am b/cachegrind/tests/Makefile.am
index 566cd39..29ae48b 100644
--- a/cachegrind/tests/Makefile.am
+++ b/cachegrind/tests/Makefile.am
@@ -1,23 +1,16 @@
-## Process this file with automake to produce Makefile.in
-
-##---------------------------------------------------------------------------
-## Cachegrind ones.
-##---------------------------------------------------------------------------
-
noinst_SCRIPTS = filter_stderr
-EXTRA_DIST =
- $(noinst_SCRIPTS) \
+EXTRA_DIST = filter_stderr \
dlclose.vgtest dlclose.stderr.exp dlclose.stderr.exp.hd \
dlclose.stdout.exp \
- fpu-28-108.vgtest fpu-28-108.stderr.exp fpu-28-108.stderr.exp.hd \
- fpu-28-108.stdout.exp
+ fpu-28-108.vgtest fpu-28-108.stderr.exp fpu-28-108.stderr.exp.hd
noinst_PROGRAMS = \
dlclose fpu-28-108 myprint.so
-CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
-CXXFLAGS = $(CFLAGS)
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
+AM_CXXFLAGS = $(AM_CFLAGS)
+AM_CCASFLAGS = $(AM_CFLAGS)
# C ones
dlclose_SOURCES = dlclose.c
@@ -26,9 +19,3 @@
myprint_so_LDFLAGS = -shared
fpu_28_108_SOURCES = fpu-28-108.S
-
-##myprint.so$(EXEEXT): $(myprint_so_OBJECTS)
-## $(CC) $(CFLAGS) -shared -o myprint.so $(myprint_so_OBJECTS)
-
-
-
diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am
index 40d0356..3ef3238 100644
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -1,12 +1,12 @@
SUBDIRS = . tests docs
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
val_PROGRAMS = vgskin_corecheck.so
diff --git a/corecheck/tests/Makefile.am b/corecheck/tests/Makefile.am
index c79d1a3..fc754e7 100644
--- a/corecheck/tests/Makefile.am
+++ b/corecheck/tests/Makefile.am
@@ -31,8 +31,8 @@
pth_atfork1 pth_cancel2 pth_cvsimple pth_empty \
pth_mutexspeed pth_once
-CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
-CXXFLAGS = $(CFLAGS)
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
+AM_CXXFLAGS = $(AM_CFLAGS)
# C ones
erringfds_SOURCES = erringfds.c
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index fd11306..b75f273 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -1,15 +1,16 @@
SUBDIRS = demangle . docs
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer \
- @PREFERRED_STACK_BOUNDARY@ -g \
- $(INCLUDES)
+ @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
INCLUDES = -I$(srcdir)/demangle -I$(top_srcdir)/include
+AM_CCASFLAGS = $(INCLUDES)
+
bin_SCRIPTS = valgrind
default.supp: $(SUPP_FILES)
@@ -81,7 +82,7 @@
vg_memory.o: vg_memory.c $(MANUAL_DEPS)
$(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
-vg_intercept.o vg_libpthread.o vg_clientfuncs.o: CFLAGS += -fno-omit-frame-pointer
+vg_intercept.o vg_libpthread.o vg_clientfuncs.o: AM_CFLAGS += -fno-omit-frame-pointer
##valgrind.so$(EXEEXT): $(valgrind_so_OBJECTS)
## $(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
diff --git a/coregrind/demangle/Makefile.am b/coregrind/demangle/Makefile.am
index a117251..d4d3e0c 100644
--- a/coregrind/demangle/Makefile.am
+++ b/coregrind/demangle/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/coregrind -I$(top_srcdir)/include
-CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer -g
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer -g
noinst_HEADERS = \
ansidecl.h \
diff --git a/example/Makefile.am b/example/Makefile.am
index 3ba7f59..36c6fba 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = .
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index 15c9d2f..2dbefee 100644
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = . docs tests
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index 572bd04..8b47529 100644
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = . docs tests
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index 67c5b91..9fbf694 100644
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -3,10 +3,11 @@
INCLUDES = -I$(top_srcdir)/include
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer \
- @PREFERRED_STACK_BOUNDARY@ -g \
- $(INCLUDES)
+ @PREFERRED_STACK_BOUNDARY@ -g
+
+AM_CCASFLAGS = $(INCLUDES)
valdir = $(libdir)/valgrind
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 1ed635c..3ef60b2 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -63,8 +63,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
diff --git a/none/Makefile.am b/none/Makefile.am
index 67c632f..d208b98 100644
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = . tests docs
-CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
+AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
valdir = $(libdir)/valgrind
diff --git a/none/tests/.cvsignore b/none/tests/.cvsignore
index 5812911..d535505 100644
--- a/none/tests/.cvsignore
+++ b/none/tests/.cvsignore
@@ -1,5 +1,6 @@
Makefile.in
Makefile
+args
bitfield1
bt_everything
bt_literal
diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 8d04c60..c4f9064 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -49,8 +49,8 @@
pth_blockedsig \
coolo_sigaction gxx304
-CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
-CXXFLAGS = $(CFLAGS)
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
+AM_CXXFLAGS = $(AM_CFLAGS)
# generic C ones
args_SOURCES = args.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2f8a16d..3921947 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,8 +13,8 @@
noinst_PROGRAMS = \
true
-CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
-CXXFLAGS = $(CFLAGS)
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
+AM_CXXFLAGS = $(AM_CFLAGS)
# generic C ones
true_SOURCES = true.c