Merge r9110 (inline Makefile.tool-flags.am) from DARWIN branch.

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

diff --git a/Makefile.tool-flags.am b/Makefile.tool-flags.am
deleted file mode 100644 (file)
index 573bd64..0000000
--- a/Makefile.tool-flags.am
+++ /dev/null
@@ -1,37 +0,0 @@
-add_includes_x86_linux = -I$(top_srcdir)/include \
-               -I@VEX_DIR@/pub \
-               -DVGA_x86=1 \
-               -DVGO_linux=1 \
-               -DVGP_x86_linux=1
-
-add_includes_amd64_linux = -I$(top_srcdir)/include \
-               -I@VEX_DIR@/pub \
-               -DVGA_amd64=1 \
-               -DVGO_linux=1 \
-               -DVGP_amd64_linux=1
-
-add_includes_ppc32_linux = -I$(top_srcdir)/include \
-               -I@VEX_DIR@/pub \
-               -DVGA_ppc32=1 \
-               -DVGO_linux=1 \
-               -DVGP_ppc32_linux=1
-
-add_includes_ppc64_linux = -I$(top_srcdir)/include \
-               -I@VEX_DIR@/pub \
-               -DVGA_ppc64=1 \
-               -DVGO_linux=1 \
-               -DVGP_ppc64_linux=1
-
-add_includes_ppc32_aix5 = -I$(top_srcdir)/include \
-               -I@VEX_DIR@/pub \
-               -DVGA_ppc32=1 \
-               -DVGO_aix5=1 \
-               -DVGP_ppc32_aix5=1
-
-add_includes_ppc64_aix5 = -I$(top_srcdir)/include \
-               -I@VEX_DIR@/pub \
-               -DVGA_ppc64=1 \
-               -DVGO_aix5=1 \
-               -DVGP_ppc64_aix5=1
-
-include $(top_srcdir)/Makefile.flags.am

diff --git a/Makefile.tool.am b/Makefile.tool.am
index 883e21ae8d2a8d94655f29d53057b6cb3af982c7..a1a193424bc78d7d0367a5782b6a18f4ea6fe2bc 100644 (file)
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -2,10 +2,45 @@
 SUBDIRS = . tests docs
 
 include $(top_srcdir)/Makefile.all.am
+include $(top_srcdir)/Makefile.flags.am
 include $(top_srcdir)/Makefile.install.am
-include $(top_srcdir)/Makefile.tool-flags.am
 include $(top_srcdir)/Makefile.tool-inplace.am
 
+add_includes_COMMON = \
+               -I$(top_srcdir)/include \
+               -I@VEX_DIR@/pub
+
+add_includes_x86_linux = $(add_includes_COMMON) \
+               -DVGA_x86=1 \
+               -DVGO_linux=1 \
+               -DVGP_x86_linux=1
+
+add_includes_amd64_linux = $(add_includes_COMMON) \
+               -DVGA_amd64=1 \
+               -DVGO_linux=1 \
+               -DVGP_amd64_linux=1
+
+add_includes_ppc32_linux = $(add_includes_COMMON) \
+               -DVGA_ppc32=1 \
+               -DVGO_linux=1 \
+               -DVGP_ppc32_linux=1
+
+add_includes_ppc64_linux = $(add_includes_COMMON) \
+               -DVGA_ppc64=1 \
+               -DVGO_linux=1 \
+               -DVGP_ppc64_linux=1
+
+add_includes_ppc32_aix5 = $(add_includes_COMMON) \
+               -DVGA_ppc32=1 \
+               -DVGO_aix5=1 \
+               -DVGP_ppc32_aix5=1
+
+add_includes_ppc64_aix5 = $(add_includes_COMMON) \
+               -DVGA_ppc64=1 \
+               -DVGO_aix5=1 \
+               -DVGP_ppc64_aix5=1
+
+
 LIBREPLACEMALLOC_X86_LINUX = \
        $(top_builddir)/coregrind/libreplacemalloc_toolpreload_x86_linux.a
 
@@ -24,6 +59,7 @@ LIBREPLACEMALLOC_PPC32_AIX5 = \
 LIBREPLACEMALLOC_PPC64_AIX5 = \
        $(top_builddir)/coregrind/libreplacemalloc_toolpreload_ppc64_aix5.a
 
+
 COREGRIND_LIBS_X86_LINUX = \
        $(top_builddir)/coregrind/libcoregrind_x86_linux.a \
        @VEX_DIR@/libvex_x86_linux.a
@@ -48,6 +84,7 @@ COREGRIND_LIBS_PPC64_AIX5 = \
        $(top_builddir)/coregrind/libcoregrind_ppc64_aix5.a \
        @VEX_DIR@/libvex_ppc64_aix5.a
 
+
 ##.PHONY:  @VEX_DIR@/libvex.a
 
 @VEX_DIR@/libvex_x86_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
@@ -89,6 +126,7 @@ COREGRIND_LIBS_PPC64_AIX5 = \
 @VEX_DIR@/priv/main/vex_svnversion.h:
        $(MAKE) -C @VEX_DIR@ CC="$(CC)" version
 
+
 TOOL_LDADD_COMMON = -lgcc
 TOOL_LDFLAGS_COMMON_LINUX = -static \
        -Wl,-defsym,valt_load_address=@VALT_LOAD_ADDRESS@ \
@@ -128,19 +166,24 @@ LIBREPLACEMALLOC_LDFLAGS_X86_LINUX = \
        -Wl,--whole-archive \
        $(LIBREPLACEMALLOC_X86_LINUX) \
        -Wl,--no-whole-archive
+
 LIBREPLACEMALLOC_LDFLAGS_AMD64_LINUX = \
        -Wl,--whole-archive \
        $(LIBREPLACEMALLOC_AMD64_LINUX) \
        -Wl,--no-whole-archive
+
 LIBREPLACEMALLOC_LDFLAGS_PPC32_LINUX = \
        -Wl,--whole-archive \
        $(LIBREPLACEMALLOC_PPC32_LINUX) \
        -Wl,--no-whole-archive
+
 LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX = \
        -Wl,--whole-archive \
        $(LIBREPLACEMALLOC_PPC64_LINUX) \
        -Wl,--no-whole-archive
+
 LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5 = \
        $(LIBREPLACEMALLOC_PPC32_AIX5)
+
 LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5 = \
        $(LIBREPLACEMALLOC_PPC64_AIX5)