Some Makefile.am changes. Lots of them affected:

- changed deprecated INCLUDES variable to AM_CPPFLAGS

- moved the -DVG_LIBDIR definition from AM_CFLAGS into AM_CPPFLAGS

- generally neatened them up a bit -- removed old commented out stuff, fixed a
  couple of other minor things

Everything works for me, hopefully it won't break things for anyone else...

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

diff --git a/Makefile.am b/Makefile.am
index 3c169136e9a15fee672dcea037556dfcb2ca5c0e..270c9dfbbc3790e79d851273dd7f617e5764e4b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,12 +13,15 @@ SUBDIRS =   coregrind . docs tests include auxprogs \
                lackey \
                none
 
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
+AM_CPPFLAGS = -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+               @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
 
-SUPP_FILES = glibc-2.1.supp glibc-2.2.supp glibc-2.3.supp xfree-3.supp xfree-4.supp
+SUPP_FILES = \
+       glibc-2.1.supp glibc-2.2.supp glibc-2.3.supp \
+       xfree-3.supp xfree-4.supp
 
 val_DATA = $(SUPP_FILES) default.supp
 

diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index c7c9d636a2f0b4d21d6b9d3f158f1d6aa2f89540..1a4f5060e488febd35992829391d3f1b9cf2540f 100644 (file)
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -2,10 +2,10 @@
 SUBDIRS = . docs tests
 
 # include memcheck/ for mac_shared.h
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/memcheck
-
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/memcheck \
+               -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+               @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
 

diff --git a/addrcheck/tests/Makefile.am b/addrcheck/tests/Makefile.am
index 47ad0df3bccb64df99c141d9b920fda809788cef..e586af521e8bd4af367781685fe9da642978c41c 100644 (file)
--- a/addrcheck/tests/Makefile.am
+++ b/addrcheck/tests/Makefile.am
@@ -1,7 +1,4 @@
-## Process this file with automake to produce Makefile.in
-
 noinst_SCRIPTS = filter_stderr
 
-EXTRA_DIST = \
-       $(noinst_SCRIPTS) \
+EXTRA_DIST = $(noinst_SCRIPTS) \
        true.stderr.exp true.vgtest

diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index ad6aa9fb7cfde40b3b52ede2130b8cc930a4731a..62e0ff71c9b8b6dbee255d0dbd88446f67f8df22 100644 (file)
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -1,10 +1,9 @@
 
 SUBDIRS = . 
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/coregrind
-
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -O -g
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/coregrind \
+               -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -O -g
 
 bin_PROGRAMS = valgrind-listener
 

diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index ef494bbe21c801f9aaf6e7adae2fd1df0b5a020f..7786699a65e416dfde34c5b599d0c6559ff9c574 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -1,10 +1,9 @@
 
-SUBDIRS = . tests docs
+SUBDIRS = . docs tests
 
-INCLUDES = -I$(top_srcdir)/include
-
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
+AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+               @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
 
@@ -20,8 +19,3 @@ val_PROGRAMS = vgskin_cachegrind.so
 
 vgskin_cachegrind_so_SOURCES = cg_main.c
 vgskin_cachegrind_so_LDFLAGS = -shared
-
-##vgskin_cachegrind.so$(EXEEXT): $(vgskin_cachegrind_so_OBJECTS)
-##     $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_cachegrind.so \
-##             $(vgskin_cachegrind_so_OBJECTS)
-

diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am
index f74488f4c743e96f39448f5e23729f77310ef055..c9fd968957ecebf052cd9b61493a443aeed80be3 100644 (file)
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -1,18 +1,13 @@
 
 SUBDIRS = . tests docs
 
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
+AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+               @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
 
-INCLUDES = -I$(top_srcdir)/include
-
 val_PROGRAMS = vgskin_corecheck.so
 
 vgskin_corecheck_so_SOURCES = cc_main.c
 vgskin_corecheck_so_LDFLAGS = -shared
-
-##vgskin_corecheck.so$(EXEEXT): $(vgskin_corecheck_so_OBJECTS)
-##     $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_corecheck.so \
-##             $(vgskin_corecheck_so_OBJECTS)

diff --git a/corecheck/tests/Makefile.am b/corecheck/tests/Makefile.am
index a6a6efc3fb297364c90aff0867da419df71afbee..8e1f2930e4bf28898032996b1eb342b89640502b 100644 (file)
--- a/corecheck/tests/Makefile.am
+++ b/corecheck/tests/Makefile.am
@@ -1,5 +1,3 @@
-## Process this file with automake to produce Makefile.in
-
 ##---------------------------------------------------------------------------
 ## These test core error checking, eg. "silly values" for malloc/calloc,
 ## pthread errors (and suppressions), signal handling errors, invalid fds for
@@ -8,8 +6,7 @@
 
 noinst_SCRIPTS = filter_stderr
 
-EXTRA_DIST = \
-       $(noinst_SCRIPTS) \
+EXTRA_DIST = $(noinst_SCRIPTS) \
        erringfds.stderr.exp erringfds.stdout.exp erringfds.vgtest \
        pth_atfork1.stderr.exp pth_atfork1.stdout.exp pth_atfork1.vgtest \
        pth_cancel2.stderr.exp pth_cancel2.vgtest \

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 41183540457b8cb2eb9d429e694050ba626aeb31..b79fc24014ccb5a36c44d9cab45918653c481896 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -1,16 +1,15 @@
 
 SUBDIRS = demangle . docs
 
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+add_includes = -I$(srcdir)/demangle -I$(top_srcdir)/include
+
+AM_CPPFLAGS = $(add_includes) -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
+AM_CCASFLAGS = $(add_includes)
 
 valdir = $(libdir)/valgrind
 
-INCLUDES = -I$(srcdir)/demangle -I$(top_srcdir)/include
-
-AM_CCASFLAGS = $(INCLUDES)
-
 bin_SCRIPTS = valgrind
 
 default.supp: $(SUPP_FILES)
@@ -26,7 +25,8 @@ libpthread_so_SOURCES = \
        vg_libpthread.c \
        vg_libpthread_unimp.c
 libpthread_so_DEPENDENCIES = $(srcdir)/vg_libpthread.vs
-libpthread_so_LDFLAGS     = -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic \
+libpthread_so_LDFLAGS     = -Werror -fno-omit-frame-pointer -UVG_LIBDIR \
+       -shared -fpic \
        -Wl,-version-script $(srcdir)/vg_libpthread.vs \
        -Wl,-z,nodelete,-z,initfirst \
        -Wl,--soname=libpthread.so.0
@@ -84,8 +84,6 @@ noinst_HEADERS = \
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) .in_place/libpthread.so.0
 
-vg_memory_c_CFLAGS = $(PREFERRED_STACK_BOUNDARY)
-
 vg_intercept.o vg_libpthread.o vg_replace_malloc.o: CFLAGS += -fno-omit-frame-pointer
 
 all-local:

diff --git a/coregrind/demangle/Makefile.am b/coregrind/demangle/Makefile.am
index 090f92316878fe775b5767cf83109754d0b4a99d..1ac2b8fc8fa664c8a42ad22e056568b0c830d517 100644 (file)
--- a/coregrind/demangle/Makefile.am
+++ b/coregrind/demangle/Makefile.am
@@ -1,6 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/coregrind -I$(top_srcdir)/include
-
+AM_CPPFLAGS = -I$(top_srcdir)/coregrind -I$(top_srcdir)/include
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer -g
 
 noinst_HEADERS = \
@@ -14,7 +13,6 @@ noinst_LIBRARIES = libdemangle.a
 libdemangle_a_SOURCES = \
        cp-demangle.c cplus-dem.c dyn-string.c safe-ctype.c
 
-# some files don't like my config.h, so just pretend it does not exist...
-cp_demange_c_CFLAGS = -Wno-unused -Wno-shadow -UHAVE_CONFIG_H
-dyn_string_c_CFLAGS = -UHAVE_CONFIG_H
-cplus_dem_c_CFLAGS = -Wno-unused
+cp-demangle.o: CFLAGS += -Wno-unused -Wno-shadow 
+cplus-dem.o: CFLAGS += -Wno-unused
+

diff --git a/example/Makefile.am b/example/Makefile.am
index b33202e7624e46b27666c825e62748e4d3d9a858..92c3413697ecebb8fbdacb8957cdebfd4189aabc 100644 (file)
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -1,13 +1,12 @@
 
 SUBDIRS = .
 
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
+AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+               @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
 
-INCLUDES = -I$(top_srcdir)/include
-
 val_PROGRAMS = vgskin_example.so
 
 vgskin_example_so_SOURCES = ex_main.c

diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index aadefa6de4a719dd8d5638307b330083ab965955..c31517a9ffd392f7b395e48ec34df3316093f7d9 100644 (file)
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -1,13 +1,12 @@
 
 SUBDIRS = . docs tests
 
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
+AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+               @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
 
-INCLUDES = -I$(top_srcdir)/include
-
 val_PROGRAMS = vgskin_helgrind.so
 
 vgskin_helgrind_so_SOURCES = hg_main.c

diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
index 47ad0df3bccb64df99c141d9b920fda809788cef..e586af521e8bd4af367781685fe9da642978c41c 100644 (file)
--- a/helgrind/tests/Makefile.am
+++ b/helgrind/tests/Makefile.am
@@ -1,7 +1,4 @@
-## Process this file with automake to produce Makefile.in
-
 noinst_SCRIPTS = filter_stderr
 
-EXTRA_DIST = \
-       $(noinst_SCRIPTS) \
+EXTRA_DIST = $(noinst_SCRIPTS) \
        true.stderr.exp true.vgtest

diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index 8b4752964a6bd09f20c4dea464d446f05bef5444..202ac99dbd049e9aee111838d68800754a119f50 100644 (file)
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -1,18 +1,14 @@
 
 SUBDIRS = . docs tests
 
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
+AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+               @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
 
-INCLUDES = -I$(top_srcdir)/include
-
 val_PROGRAMS = vgskin_lackey.so
 
 vgskin_lackey_so_SOURCES = lk_main.c
 vgskin_lackey_so_LDFLAGS = -shared
 
-##vgskin_lackey.so$(EXEEXT): $(vgskin_lackey_so_OBJECTS)
-##     $(CC) $(CFLAGS) $(LDFLAGS) -shared -o vgskin_lackey.so \
-##             $(vgskin_lackey_so_OBJECTS)

diff --git a/lackey/tests/Makefile.am b/lackey/tests/Makefile.am
index 47ad0df3bccb64df99c141d9b920fda809788cef..e586af521e8bd4af367781685fe9da642978c41c 100644 (file)
--- a/lackey/tests/Makefile.am
+++ b/lackey/tests/Makefile.am
@@ -1,7 +1,4 @@
-## Process this file with automake to produce Makefile.in
-
 noinst_SCRIPTS = filter_stderr
 
-EXTRA_DIST = \
-       $(noinst_SCRIPTS) \
+EXTRA_DIST = $(noinst_SCRIPTS) \
        true.stderr.exp true.vgtest

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index 7b775e5b3f37c7887c80d6d95f3ac8ac2f5fa836..e93850731271fe1bc42c3505ae41c2f5d356b2a2 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -1,13 +1,12 @@
 
 SUBDIRS = . tests docs
 
-INCLUDES = -I$(top_srcdir)/include
+all_includes = -I$(top_srcdir)/include
 
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+AM_CPPFLAGS = $(all_includes) -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
-
-AM_CCASFLAGS = $(INCLUDES)
+AM_CCASFLAGS = $(all_includes)
 
 valdir = $(libdir)/valgrind
 

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 1704e040c7047740e52e95fa5db150ec18d2d430..1c6dfc1a2c86d34747852444b6941b414f211e72 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -1,20 +1,12 @@
-## Process this file with automake to produce Makefile.in
-
 ##---------------------------------------------------------------------------
 ## Need more tests:
 ## - lots more mmap/munmap/mremap/mprotect ones
-
-## Notes:
-##   - HEAD and ERASER stderr.exp are different for signal2 due to lazy vs.
-##     strict EIP updating
 ##---------------------------------------------------------------------------
 
 noinst_SCRIPTS = filter_allocs filter_leak_check_size filter_stderr \
                  filter_stderr_backtrace
 
-
-EXTRA_DIST = \
-       $(noinst_SCRIPTS) \
+EXTRA_DIST = $(noinst_SCRIPTS) \
        badaddrvalue.stderr.exp \
        badaddrvalue.stdout.exp badaddrvalue.vgtest \
        badfree-2trace.stderr.exp badfree-2trace.vgtest \
@@ -73,9 +65,9 @@ check_PROGRAMS = \
        trivialleak tronical weirdioctl \
        mismatches new_override
 
+AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g 
 AM_CXXFLAGS = $(AM_CFLAGS)
-INCLUDES = -I$(top_srcdir)/include
 
 # C ones
 badaddrvalue_SOURCES   = badaddrvalue.c

diff --git a/none/Makefile.am b/none/Makefile.am
index 1fb9d201f802257c93cb66c82c19a03650c41ff5..8f8ce9d75751a10f8a6d381f4ebfb14e706ea441 100644 (file)
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -1,13 +1,12 @@
 
-SUBDIRS = . tests docs
+SUBDIRS = . docs tests
 
-AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-               -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
+AM_CPPFLAGS = -I$(top_srcdir)/include -DVG_LIBDIR="\"$(libdir)"\"
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
+               @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
 
-INCLUDES = -I$(top_srcdir)/include
-
 val_PROGRAMS = vgskin_none.so
 
 vgskin_none_so_SOURCES          = nl_main.c

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index a0f4ceeaf7cee03e70cf553f9027c71cfce334b7..fbd7c3b50d91e9ab3065d61b0cf6f5cf4d32132b 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -1,13 +1,6 @@
-## Process this file with automake to produce Makefile.in
-
-##---------------------------------------------------------------------------
-## These ones all work fine without producing errors in any skin.
-##---------------------------------------------------------------------------
-
 noinst_SCRIPTS = filter_stderr
 
-EXTRA_DIST = \
-       $(noinst_SCRIPTS) \
+EXTRA_DIST = $(noinst_SCRIPTS) \
        args.stderr.exp args.stdout.exp args.vgtest \
        bitfield1.stderr.exp bitfield1.vgtest \
        bt_everything.stderr.exp \
@@ -89,6 +82,5 @@ coolo_sigaction_SOURCES       = coolo_sigaction.cpp
 gxx304_SOURCES         = gxx304.cpp
 
 # must be built with these flags -- bug only occurred with them
-fpu_lazy_eflags.o: fpu_lazy_eflags.c
-       $(COMPILE) -O2 -mcpu=pentiumpro -march=pentiumpro -c $<
+fpu_lazy_eflags.o: CFLAGS += -O2 -mcpu=pentiumpro -march=pentiumpro
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e29b3d1ce78052c53e90fce8ca0110638c24c0a3..b2997a6a78813e73765405c9c305034dbf3b8fc8 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,6 +8,8 @@ noinst_SCRIPTS = \
        filter_stderr_basic \
        filter_test_paths
 
+EXTRA_DIST = $(noinst_SCRIPTS)
+
 check_PROGRAMS = \
        true
 
@@ -17,5 +19,4 @@ AM_CXXFLAGS = $(AM_CFLAGS)
 # generic C ones
 true_SOURCES   = true.c
 
-EXTRA_DIST = $(noinst_SCRIPTS)