|
From: <sv...@va...> - 2009-06-12 11:32:02
|
Author: njn Date: 2009-06-12 12:31:54 +0100 (Fri, 12 Jun 2009) New Revision: 10311 Log: More cut+paste removal in the build system. Modified: branches/BUILD_TWEAKS/callgrind/Makefile.am branches/BUILD_TWEAKS/drd/Makefile.am branches/BUILD_TWEAKS/helgrind/Makefile.am branches/BUILD_TWEAKS/massif/Makefile.am branches/BUILD_TWEAKS/memcheck/Makefile.am branches/BUILD_TWEAKS/none/Makefile.am Modified: branches/BUILD_TWEAKS/callgrind/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/callgrind/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/callgrind/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -40,8 +40,7 @@ CALLGRIND_CFLAGS_COMMON = -I$(top_srcdir)/cachegrind -clincludedir = $(includedir)/valgrind -clinclude_HEADERS = \ +pkginclude_HEADERS = \ callgrind.h callgrind_x86_linux_SOURCES = $(CALLGRIND_SOURCES_COMMON) $(CALLGRIND_SOURCES_X86) Modified: branches/BUILD_TWEAKS/drd/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/drd/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/drd/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -131,10 +131,8 @@ drd_semaphore.c \ drd_suppression.c -drdincludedir = $(includedir)/valgrind +pkginclude_HEADERS = drd.h -drdinclude_HEADERS = drd.h - noinst_HEADERS = \ drd_barrier.h \ drd_basics.h \ Modified: branches/BUILD_TWEAKS/helgrind/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/helgrind/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/helgrind/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -155,10 +155,8 @@ helgrind_amd64_darwin_LDADD = $(TOOL_LDADD_AMD64_DARWIN) helgrind_amd64_darwin_LDFLAGS = $(TOOL_LDFLAGS_AMD64_DARWIN) -hgincludedir = $(includedir)/valgrind +pkginclude_HEADERS = helgrind.h -hginclude_HEADERS = helgrind.h - noinst_HEADERS = \ hg_basics.h hg_lock_n_thread.h hg_errors.h hg_wordset.h \ libhb.h Modified: branches/BUILD_TWEAKS/massif/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/massif/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/massif/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -13,7 +13,9 @@ noinst_PROGRAMS += massif-@VGCONF_ARCH_SEC@-@VGCONF_OS@ endif -massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = ms_main.c +MASSIF_SOURCES_COMMON = ms_main.c + +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 = \ @@ -25,7 +27,7 @@ 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 = ms_main.c +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 = \ Modified: branches/BUILD_TWEAKS/memcheck/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/memcheck/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/memcheck/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -2,109 +2,25 @@ SUBDIRS += perf -noinst_PROGRAMS = -noinst_DSYMS = -if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -noinst_PROGRAMS += memcheck-x86-linux vgpreload_memcheck-x86-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -noinst_PROGRAMS += memcheck-amd64-linux vgpreload_memcheck-amd64-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -noinst_PROGRAMS += memcheck-ppc32-linux vgpreload_memcheck-ppc32-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -noinst_PROGRAMS += memcheck-ppc64-linux vgpreload_memcheck-ppc64-linux.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -noinst_PROGRAMS += memcheck-ppc32-aix5 vgpreload_memcheck-ppc32-aix5.so -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -noinst_PROGRAMS += memcheck-ppc64-aix5 vgpreload_memcheck-ppc64-aix5.so -endif -if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN -noinst_PROGRAMS += memcheck-x86-darwin vgpreload_memcheck-x86-darwin.so -noinst_DSYMS += vgpreload_memcheck-x86-darwin.so -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN -noinst_PROGRAMS += memcheck-amd64-darwin vgpreload_memcheck-amd64-darwin.so -noinst_DSYMS += vgpreload_memcheck-amd64-darwin.so -endif +#---------------------------------------------------------------------------- +# Headers +#---------------------------------------------------------------------------- -VGPRELOAD_MEMCHECK_SOURCES_COMMON = mc_replace_strmem.c +pkginclude_HEADERS = \ + memcheck.h -vgpreload_memcheck_x86_linux_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_x86_linux_so_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -vgpreload_memcheck_x86_linux_so_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_x86_linux_so_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) -vgpreload_memcheck_x86_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_LINUX) -vgpreload_memcheck_x86_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_X86_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_X86_LINUX) +noinst_HEADERS = \ + mc_include.h -vgpreload_memcheck_amd64_linux_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_memcheck_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_amd64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) -vgpreload_memcheck_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) -vgpreload_memcheck_amd64_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_AMD64_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_AMD64_LINUX) +#---------------------------------------------------------------------------- +# memcheck-<platform> +#---------------------------------------------------------------------------- -vgpreload_memcheck_ppc32_linux_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -vgpreload_memcheck_ppc32_linux_so_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_ppc32_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) -vgpreload_memcheck_ppc32_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_LINUX) -vgpreload_memcheck_ppc32_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC32_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_LINUX) +noinst_PROGRAMS = memcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@ +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += memcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@ +endif -vgpreload_memcheck_ppc64_linux_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_ppc64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -vgpreload_memcheck_ppc64_linux_so_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_ppc64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) -vgpreload_memcheck_ppc64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_LINUX) -vgpreload_memcheck_ppc64_linux_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC64_LINUX) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX) - -vgpreload_memcheck_ppc32_aix5_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_ppc32_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -vgpreload_memcheck_ppc32_aix5_so_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_ppc32_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) -vgpreload_memcheck_ppc32_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC32_AIX5) -vgpreload_memcheck_ppc32_aix5_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC32_AIX5) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5) - -vgpreload_memcheck_ppc64_aix5_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_ppc64_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -vgpreload_memcheck_ppc64_aix5_so_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_ppc64_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) -vgpreload_memcheck_ppc64_aix5_so_DEPENDENCIES = $(LIBREPLACEMALLOC_PPC64_AIX5) -vgpreload_memcheck_ppc64_aix5_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_PPC64_AIX5) \ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5) - -vgpreload_memcheck_x86_darwin_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_x86_darwin_so_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -vgpreload_memcheck_x86_darwin_so_CFLAGS = $(AM_CFLAGS_X86_DARWIN) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_x86_darwin_so_CCASFLAGS = $(AM_CCASFLAGS_X86_DARWIN) -vgpreload_memcheck_x86_darwin_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_DARWIN) -vgpreload_memcheck_x86_darwin_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_X86_DARWIN) \ - $(LIBREPLACEMALLOC_LDFLAGS_X86_DARWIN) - -vgpreload_memcheck_amd64_darwin_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) -vgpreload_memcheck_amd64_darwin_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -vgpreload_memcheck_amd64_darwin_so_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) $(AM_CFLAGS_PIC) -O2 -vgpreload_memcheck_amd64_darwin_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_DARWIN) -vgpreload_memcheck_amd64_darwin_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_DARWIN) -vgpreload_memcheck_amd64_darwin_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_AMD64_DARWIN) \ - $(LIBREPLACEMALLOC_LDFLAGS_AMD64_DARWIN) - MEMCHECK_SOURCES_COMMON = \ mc_leakcheck.c \ mc_malloc_wrappers.c \ @@ -113,78 +29,80 @@ mc_machine.c \ mc_errors.c -memcheck_x86_linux_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -memcheck_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) -O2 -memcheck_x86_linux_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) -memcheck_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) -memcheck_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) -memcheck_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(MEMCHECK_SOURCES_COMMON) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -O2 +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CCASFLAGS = \ + $(AM_CCASFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(MEMCHECK_SOURCES_COMMON) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -O2 +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CCASFLAGS = \ + $(AM_CCASFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -memcheck_amd64_linux_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -memcheck_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -O2 -memcheck_amd64_linux_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) -memcheck_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) -memcheck_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) -memcheck_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) +mc_main.o: CFLAGS += -fomit-frame-pointer -memcheck_ppc32_linux_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -memcheck_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -O2 -memcheck_ppc32_linux_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) -memcheck_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) -memcheck_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) -memcheck_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) +#---------------------------------------------------------------------------- +# vgpreload_memcheck_<platform>.so +#---------------------------------------------------------------------------- -memcheck_ppc64_linux_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -memcheck_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -O2 -memcheck_ppc64_linux_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) -memcheck_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) -memcheck_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) -memcheck_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) +noinst_PROGRAMS += vgpreload_memcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += vgpreload_memcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so +endif -memcheck_ppc32_aix5_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -memcheck_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -O2 -memcheck_ppc32_aix5_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) -memcheck_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) -memcheck_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) -memcheck_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) +if VGCONF_OS_IS_DARWIN +noinst_DSYMS = $(noinst_PROGRAMS) +endif -memcheck_ppc64_aix5_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -memcheck_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -O2 -memcheck_ppc64_aix5_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) -memcheck_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) -memcheck_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) -memcheck_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) +VGPRELOAD_MEMCHECK_SOURCES_COMMON = mc_replace_strmem.c -memcheck_x86_darwin_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_x86_darwin_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -memcheck_x86_darwin_CFLAGS = $(AM_CFLAGS_X86_DARWIN) -O2 -memcheck_x86_darwin_CCASFLAGS = $(AM_CCASFLAGS_X86_DARWIN) -memcheck_x86_darwin_DEPENDENCIES = $(COREGRIND_LIBS_X86_DARWIN) -memcheck_x86_darwin_LDADD = $(TOOL_LDADD_X86_DARWIN) -memcheck_x86_darwin_LDFLAGS = $(TOOL_LDFLAGS_X86_DARWIN) +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = \ + $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) -O2 +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CCASFLAGS = \ + $(AM_CCASFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ + $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@) +vgpreload_memcheck_@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_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ + $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) -O2 +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CCASFLAGS = \ + $(AM_CCASFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \ + $(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@) +vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ + $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) \ + $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -memcheck_amd64_darwin_SOURCES = $(MEMCHECK_SOURCES_COMMON) -memcheck_amd64_darwin_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -memcheck_amd64_darwin_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) -O2 -memcheck_amd64_darwin_CCASFLAGS = $(AM_CCASFLAGS_AMD64_DARWIN) -memcheck_amd64_darwin_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_DARWIN) -memcheck_amd64_darwin_LDADD = $(TOOL_LDADD_AMD64_DARWIN) -memcheck_amd64_darwin_LDFLAGS = $(TOOL_LDFLAGS_AMD64_DARWIN) - -mcincludedir = $(includedir)/valgrind - -mcinclude_HEADERS = \ - memcheck.h - -noinst_HEADERS = \ - mc_include.h - mc_replace_strmem.o: CFLAGS += -fno-omit-frame-pointer -mc_main.o: CFLAGS += -fomit-frame-pointer Modified: branches/BUILD_TWEAKS/none/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/none/Makefile.am 2009-06-12 07:50:56 UTC (rev 10310) +++ branches/BUILD_TWEAKS/none/Makefile.am 2009-06-12 11:31:54 UTC (rev 10311) @@ -1,85 +1,39 @@ include $(top_srcdir)/Makefile.tool.am -noinst_PROGRAMS = -if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -noinst_PROGRAMS += none-x86-linux +#---------------------------------------------------------------------------- +# none-<platform> +#---------------------------------------------------------------------------- + +noinst_PROGRAMS = none-@VGCONF_ARCH_PRI@-@VGCONF_OS@ +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += none-@VGCONF_ARCH_SEC@-@VGCONF_OS@ endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -noinst_PROGRAMS += none-amd64-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -noinst_PROGRAMS += none-ppc32-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -noinst_PROGRAMS += none-ppc64-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -noinst_PROGRAMS += none-ppc32-aix5 -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -noinst_PROGRAMS += none-ppc64-aix5 -endif -if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN -noinst_PROGRAMS += none-x86-darwin -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN -noinst_PROGRAMS += none-amd64-darwin -endif NONE_SOURCES_COMMON = nl_main.c -none_x86_linux_SOURCES = $(NONE_SOURCES_COMMON) -none_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -none_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) -none_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) -none_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) -none_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(NONE_SOURCES_COMMON) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(NONE_SOURCES_COMMON) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -none_amd64_linux_SOURCES = $(NONE_SOURCES_COMMON) -none_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -none_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -none_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) -none_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) -none_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) -none_ppc32_linux_SOURCES = $(NONE_SOURCES_COMMON) -none_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -none_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -none_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) -none_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) -none_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) - -none_ppc64_linux_SOURCES = $(NONE_SOURCES_COMMON) -none_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -none_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -none_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) -none_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) -none_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) - -none_ppc32_aix5_SOURCES = $(NONE_SOURCES_COMMON) -none_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -none_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -none_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) -none_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) -none_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) - -none_ppc64_aix5_SOURCES = $(NONE_SOURCES_COMMON) -none_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -none_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -none_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) -none_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) -none_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) - -none_x86_darwin_SOURCES = $(NONE_SOURCES_COMMON) -none_x86_darwin_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -none_x86_darwin_CFLAGS = $(AM_CFLAGS_X86_DARWIN) -none_x86_darwin_DEPENDENCIES = $(COREGRIND_LIBS_X86_DARWIN) -none_x86_darwin_LDADD = $(TOOL_LDADD_X86_DARWIN) -none_x86_darwin_LDFLAGS = $(TOOL_LDFLAGS_X86_DARWIN) - -none_amd64_darwin_SOURCES = $(NONE_SOURCES_COMMON) -none_amd64_darwin_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -none_amd64_darwin_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) -none_amd64_darwin_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_DARWIN) -none_amd64_darwin_LDADD = $(TOOL_LDADD_AMD64_DARWIN) -none_amd64_darwin_LDFLAGS = $(TOOL_LDFLAGS_AMD64_DARWIN) |