fix make distcheck with newer automake

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

diff --git a/Makefile.am b/Makefile.am
index b63b4525a157c0697842d7d7267478659faa57e5..df2e57ed10613e3fa6835de6e871263dec920077 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS =       coregrind . docs tests include auxprogs \
                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 @@ val_DATA = $(SUPP_FILES) default.supp
 
 BUILT_SOURCES = default.supp
 
+CLEANFILES = default.supp
+
 default.supp: $(SUPP_FILES)
 
 bzdist: dist

diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index 596e9dafe4b990754ef34e48c696c58ca364a117..5ba2f7831619edaac4d7c915e7b82b406a98aa98 100644 (file)
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = . docs tests
 # 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 (file)
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 23df8e84c43c63726e8db7708a6fe3d6d8626c40..ad6aa9fb7cfde40b3b52ede2130b8cc930a4731a 100644 (file)
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = .
 
 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 a877e335cd714151d060841c348ee7640481f9eb..ef494bbe21c801f9aaf6e7adae2fd1df0b5a020f 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = . tests docs
 
 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 @@ EXTRA_DIST = \
        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 566cd396ded360489f3b225cc9c267afa2d58801..29ae48b4bafadac0dfae9479a6e663cac006ef9e 100644 (file)
--- 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_SOURCES    = myprint.c
 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 40d0356b63d2afc7b6e9f454d65cfec159bd02f9..3ef32380fb42103c057cf4799767735dc3bf5195 100644 (file)
--- 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 c79d1a3bb1b4bb7d4c04b411eb9e59a9e56dd42a..fc754e736c6de9b008cd951bff238c8f040723e8 100644 (file)
--- a/corecheck/tests/Makefile.am
+++ b/corecheck/tests/Makefile.am
@@ -31,8 +31,8 @@ noinst_PROGRAMS = \
        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 fd113067a65d01d1e2a0dac0e2cf8c3d6cff5a8e..b75f2735f5b5b61b586a89e13fc8ea0ad2f2f039 100644 (file)
--- 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 @@ MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 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 a1172514c6d59e9f5031f3cae3caf7f4c564f75b..d4d3e0c45da0b317c98e8f78c5e272b1062b71c2 100644 (file)
--- 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 3ba7f594dafa05776c90233ee23794e246cab109..36c6fbad54353054a9bf3392ddd34d29be9d066a 100644 (file)
--- 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 15c9d2f860dfad7763a7bee3f2bdb68b2419302b..2dbefee1f9c305cdd845699c893aa95d2979f421 100644 (file)
--- 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 572bd043c4f0a874132823c1f9749c785c611625..8b4752964a6bd09f20c4dea464d446f05bef5444 100644 (file)
--- 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 67c5b915413cfca70a0103da2ad57a65d3101b59..9fbf694e5f3c33d536fa36b58f8231cd12de7fa9 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -3,10 +3,11 @@ SUBDIRS = . tests docs
 
 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 1ed635c21f4b3915f83d3f65bbf7fa96db7e2f7a..3ef60b23ca66d27db102644b1a721874478fe86e 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -63,8 +63,8 @@ noinst_PROGRAMS = \
        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 67c632f0742e79b0277f5713cab2ae7f50107b74..d208b984b1447cd9570771cbf65561b7d19433db 100644 (file)
--- 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 5812911b8e2990d2cba34d86d576297b6cf043fd..d53550595e67d68155c2f0abe648dd90a155a6aa 100644 (file)
--- 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 8d04c60f478bda5d9afea6721b7e29ba944117ce..c4f90641141dcc5f02057b40cc79e93f0a406500 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -49,8 +49,8 @@ noinst_PROGRAMS = \
        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 2f8a16de639caba929273408fdc08e0fb0cf77bb..3921947012d28278dc22e447549f7642d6e5c9b6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,8 +13,8 @@ noinst_SCRIPTS = \
 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