diff options
Diffstat (limited to 'massif')
| -rw-r--r-- | massif/Makefile.am | 204 | ||||
| -rw-r--r-- | massif/tests/Makefile.am | 4 |
2 files changed, 65 insertions, 143 deletions
diff --git a/massif/Makefile.am b/massif/Makefile.am index 3033df1eb..75104803d 100644 --- a/massif/Makefile.am +++ b/massif/Makefile.am @@ -4,153 +4,75 @@ SUBDIRS += perf bin_SCRIPTS = ms_print -noinst_PROGRAMS = -noinst_DSYMS = -if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -noinst_PROGRAMS += massif-x86-linux vgpreload_massif-x86-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -noinst_PROGRAMS += massif-amd64-linux vgpreload_massif-amd64-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -noinst_PROGRAMS += massif-ppc32-linux vgpreload_massif-ppc32-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -noinst_PROGRAMS += massif-ppc64-linux vgpreload_massif-ppc64-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -noinst_PROGRAMS += massif-ppc32-aix5 vgpreload_massif-ppc32-aix5.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -noinst_PROGRAMS += massif-ppc64-aix5 vgpreload_massif-ppc64-aix5.so -endif -if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN -noinst_PROGRAMS += massif-x86-darwin vgpreload_massif-x86-darwin.so -noinst_DSYMS += vgpreload_massif-x86-darwin.so -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN -noinst_PROGRAMS += massif-amd64-darwin vgpreload_massif-amd64-darwin.so -noinst_DSYMS += vgpreload_massif-amd64-darwin.so -endif - -vgpreload_massif_x86_linux_so_SOURCES = -vgpreload_massif_x86_linux_so_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -vgpreload_massif_x86_linux_so_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) -vgpreload_massif_x86_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_LINUX) -vgpreload_massif_x86_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_X86_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_X86_LINUX) - -vgpreload_massif_amd64_linux_so_SOURCES = -vgpreload_massif_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_massif_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) -vgpreload_massif_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) -vgpreload_massif_amd64_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_AMD64_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_AMD64_LINUX) - -vgpreload_massif_ppc32_linux_so_SOURCES = -vgpreload_massif_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -vgpreload_massif_ppc32_linux_so_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) -vgpreload_massif_ppc32_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_LINUX) -vgpreload_massif_ppc32_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC32_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_LINUX) +#---------------------------------------------------------------------------- +# massif-<platform> +#---------------------------------------------------------------------------- -vgpreload_massif_ppc64_linux_so_SOURCES = -vgpreload_massif_ppc64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -vgpreload_massif_ppc64_linux_so_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) -vgpreload_massif_ppc64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_LINUX) -vgpreload_massif_ppc64_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC64_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX) - -vgpreload_massif_ppc32_aix5_so_SOURCES = -vgpreload_massif_ppc32_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -vgpreload_massif_ppc32_aix5_so_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) $(AM_CFLAGS_PIC) -vgpreload_massif_ppc32_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_AIX5) -vgpreload_massif_ppc32_aix5_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC32_AIX5) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5) - -vgpreload_massif_ppc64_aix5_so_SOURCES = -vgpreload_massif_ppc64_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -vgpreload_massif_ppc64_aix5_so_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) -vgpreload_massif_ppc64_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_AIX5) -vgpreload_massif_ppc64_aix5_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC64_AIX5) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5) - -vgpreload_massif_x86_darwin_so_SOURCES = -vgpreload_massif_x86_darwin_so_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -vgpreload_massif_x86_darwin_so_CFLAGS = $(AM_CFLAGS_X86_DARWIN) $(AM_CFLAGS_PIC) -vgpreload_massif_x86_darwin_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_DARWIN) -vgpreload_massif_x86_darwin_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_X86_DARWIN) \ - $(LIBREPLACEMALLOC_LDFLAGS_X86_DARWIN) - -vgpreload_massif_amd64_darwin_so_SOURCES = -vgpreload_massif_amd64_darwin_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -vgpreload_massif_amd64_darwin_so_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) $(AM_CFLAGS_PIC) -vgpreload_massif_amd64_darwin_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_DARWIN) -vgpreload_massif_amd64_darwin_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_AMD64_DARWIN) \ - $(LIBREPLACEMALLOC_LDFLAGS_AMD64_DARWIN) +noinst_PROGRAMS = massif-@VGCONF_ARCH_PRI@-@VGCONF_OS@ +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += massif-@VGCONF_ARCH_SEC@-@VGCONF_OS@ +endif MASSIF_SOURCES_COMMON = ms_main.c -massif_x86_linux_SOURCES = $(MASSIF_SOURCES_COMMON) -massif_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -massif_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) -massif_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) -massif_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) -massif_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) - -massif_amd64_linux_SOURCES = $(MASSIF_SOURCES_COMMON) -massif_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -massif_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -massif_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) -massif_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) -massif_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) - -massif_ppc32_linux_SOURCES = $(MASSIF_SOURCES_COMMON) -massif_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -massif_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -massif_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) -massif_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) -massif_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) +massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(MASSIF_SOURCES_COMMON) +massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \ + $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) +massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) +massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(MASSIF_SOURCES_COMMON) +massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \ + $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) +massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) +massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -massif_ppc64_linux_SOURCES = $(MASSIF_SOURCES_COMMON) -massif_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -massif_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -massif_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) -massif_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) -massif_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) +#---------------------------------------------------------------------------- +# vgpreload_massif-<platform>.so +#---------------------------------------------------------------------------- -massif_ppc32_aix5_SOURCES = $(MASSIF_SOURCES_COMMON) -massif_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -massif_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -massif_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) -massif_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) -massif_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) +noinst_PROGRAMS += vgpreload_massif-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += vgpreload_massif-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so +endif -massif_ppc64_aix5_SOURCES = $(MASSIF_SOURCES_COMMON) -massif_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -massif_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -massif_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) -massif_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) -massif_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) +if VGCONF_OS_IS_DARWIN +noinst_DSYMS = $(noinst_PROGRAMS) +endif -massif_x86_darwin_SOURCES = $(MASSIF_SOURCES_COMMON) -massif_x86_darwin_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -massif_x86_darwin_CFLAGS = $(AM_CFLAGS_X86_DARWIN) -massif_x86_darwin_DEPENDENCIES = $(COREGRIND_LIBS_X86_DARWIN) -massif_x86_darwin_LDADD = $(TOOL_LDADD_X86_DARWIN) -massif_x86_darwin_LDFLAGS = $(TOOL_LDFLAGS_X86_DARWIN) +vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = +vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) +vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ + $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) +vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = +vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) +vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ + $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) +vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -massif_amd64_darwin_SOURCES = $(MASSIF_SOURCES_COMMON) -massif_amd64_darwin_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -massif_amd64_darwin_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) -massif_amd64_darwin_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_DARWIN) -massif_amd64_darwin_LDADD = $(TOOL_LDADD_AMD64_DARWIN) -massif_amd64_darwin_LDFLAGS = $(TOOL_LDFLAGS_AMD64_DARWIN) diff --git a/massif/tests/Makefile.am b/massif/tests/Makefile.am index c85bbfbe2..ecdd01a4d 100644 --- a/massif/tests/Makefile.am +++ b/massif/tests/Makefile.am @@ -1,9 +1,9 @@ include $(top_srcdir)/Makefile.tool-tests.am -noinst_SCRIPTS = filter_stderr filter_verbose +dist_noinst_SCRIPTS = filter_stderr filter_verbose -EXTRA_DIST = $(noinst_SCRIPTS) \ +EXTRA_DIST = \ alloc-fns-A.post.exp alloc-fns-A.stderr.exp alloc-fns-A.vgtest \ alloc-fns-B.post.exp alloc-fns-B.stderr.exp alloc-fns-B.vgtest \ basic.post.exp basic.stderr.exp basic.vgtest \ |