Menu
▾
▴
[Valgrind-developers] valgrind: r10315 - in branches/BUILD_TWEAKS: cachegrind callgrind lackey
|
From: <sv...@va...> - 2009-06-13 01:00:50
|
Author: njn Date: 2009-06-13 01:50:38 +0100 (Sat, 13 Jun 2009) New Revision: 10315 Log: Avoid automake cut+paste for Lackey and Callgrind. Modified: branches/BUILD_TWEAKS/cachegrind/Makefile.am branches/BUILD_TWEAKS/callgrind/Makefile.am branches/BUILD_TWEAKS/lackey/Makefile.am Modified: branches/BUILD_TWEAKS/cachegrind/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/cachegrind/Makefile.am 2009-06-13 00:37:53 UTC (rev 10314) +++ branches/BUILD_TWEAKS/cachegrind/Makefile.am 2009-06-13 00:50:38 UTC (rev 10315) @@ -2,7 +2,10 @@ bin_SCRIPTS = cg_annotate -noinst_HEADERS = cg_arch.h cg_sim.c cg_branchpred.c +noinst_HEADERS = \ + cg_arch.h \ + cg_branchpred.c \ + cg_sim.c #---------------------------------------------------------------------------- # cg_merge Modified: branches/BUILD_TWEAKS/callgrind/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/callgrind/Makefile.am 2009-06-13 00:37:53 UTC (rev 10314) +++ branches/BUILD_TWEAKS/callgrind/Makefile.am 2009-06-13 00:50:38 UTC (rev 10315) @@ -1,100 +1,75 @@ include $(top_srcdir)/Makefile.tool.am -bin_SCRIPTS = callgrind_annotate callgrind_control +#---------------------------------------------------------------------------- +# Headers, etc +#---------------------------------------------------------------------------- -noinst_HEADERS = global.h costs.h events.h +pkginclude_HEADERS = callgrind.h -noinst_PROGRAMS = -if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -noinst_PROGRAMS += callgrind-x86-linux -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -noinst_PROGRAMS += callgrind-amd64-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -noinst_PROGRAMS += callgrind-ppc32-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -noinst_PROGRAMS += callgrind-ppc64-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -noinst_PROGRAMS += callgrind-ppc32-aix5 -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -noinst_PROGRAMS += callgrind-ppc64-aix5 -endif -if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN -noinst_PROGRAMS += callgrind-x86-darwin -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN -noinst_PROGRAMS += callgrind-amd64-darwin -endif +bin_SCRIPTS = \ + callgrind_annotate \ + callgrind_control -CALLGRIND_SOURCES_COMMON = main.c events.c bb.c clo.c \ - costs.c bbcc.c command.c debug.c fn.c \ - sim.c callstack.c context.c dump.c jumps.c \ - threads.c \ - ../cachegrind/cg-x86-amd64.c \ - ../cachegrind/cg-ppc32.c \ - ../cachegrind/cg-ppc64.c +noinst_HEADERS = \ + costs.h \ + events.h \ + global.h -CALLGRIND_CFLAGS_COMMON = -I$(top_srcdir)/cachegrind +#---------------------------------------------------------------------------- +# callgrind-<platform> +#---------------------------------------------------------------------------- -pkginclude_HEADERS = \ - callgrind.h +noinst_PROGRAMS = callgrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@ +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += callgrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@ +endif -callgrind_x86_linux_SOURCES = $(CALLGRIND_SOURCES_COMMON) $(CALLGRIND_SOURCES_X86) -callgrind_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -callgrind_x86_linux_CFLAGS = $(CALLGRIND_CFLAGS_COMMON) $(AM_CFLAGS_X86_LINUX) -callgrind_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) -callgrind_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) -callgrind_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) +CALLGRIND_SOURCES_COMMON = \ + bb.c \ + bbcc.c \ + callstack.c \ + clo.c \ + command.c \ + context.c \ + costs.c \ + debug.c \ + dump.c \ + events.c \ + fn.c \ + jumps.c \ + main.c \ + sim.c \ + threads.c \ + ../cachegrind/cg-x86-amd64.c \ + ../cachegrind/cg-ppc32.c \ + ../cachegrind/cg-ppc64.c + +CALLGRIND_CFLAGS_COMMON = -I$(top_srcdir)/cachegrind -callgrind_amd64_linux_SOURCES = $(CALLGRIND_SOURCES_COMMON) $(CALLGRIND_SOURCES_AMD64) -callgrind_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -callgrind_amd64_linux_CFLAGS = $(CALLGRIND_CFLAGS_COMMON) $(AM_CFLAGS_AMD64_LINUX) -callgrind_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) -callgrind_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) -callgrind_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) +callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = \ + $(CALLGRIND_SOURCES_COMMON) +callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(CALLGRIND_CFLAGS_COMMON) +callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@) +callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) +callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ + $(CALLGRIND_SOURCES_COMMON) +callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(CALLGRIND_CFLAGS_COMMON) +callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@) +callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) +callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -callgrind_ppc32_linux_SOURCES = $(CALLGRIND_SOURCES_COMMON) $(CALLGRIND_SOURCES_PPC32) -callgrind_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -callgrind_ppc32_linux_CFLAGS = $(CALLGRIND_CFLAGS_COMMON) $(AM_CFLAGS_PPC32_LINUX) -callgrind_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) -callgrind_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) -callgrind_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) - -callgrind_ppc64_linux_SOURCES = $(CALLGRIND_SOURCES_COMMON) $(CALLGRIND_SOURCES_PPC64) -callgrind_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -callgrind_ppc64_linux_CFLAGS = $(CALLGRIND_CFLAGS_COMMON) $(AM_CFLAGS_PPC64_LINUX) -callgrind_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) -callgrind_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) -callgrind_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) - -callgrind_ppc32_aix5_SOURCES = $(CALLGRIND_SOURCES_COMMON) $(CALLGRIND_SOURCES_PPC32) -callgrind_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -callgrind_ppc32_aix5_CFLAGS = $(CALLGRIND_CFLAGS_COMMON) $(AM_CFLAGS_PPC32_AIX5) -callgrind_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) -callgrind_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) -callgrind_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) - -callgrind_ppc64_aix5_SOURCES = $(CALLGRIND_SOURCES_COMMON) $(CALLGRIND_SOURCES_PPC64) -callgrind_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -callgrind_ppc64_aix5_CFLAGS = $(CALLGRIND_CFLAGS_COMMON) $(AM_CFLAGS_PPC64_AIX5) -callgrind_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) -callgrind_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) -callgrind_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) - -callgrind_x86_darwin_SOURCES = $(CALLGRIND_SOURCES_COMMON) $(CALLGRIND_SOURCES_X86) -callgrind_x86_darwin_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -callgrind_x86_darwin_CFLAGS = $(CALLGRIND_CFLAGS_COMMON) $(AM_CFLAGS_X86_DARWIN) -callgrind_x86_darwin_DEPENDENCIES = $(COREGRIND_LIBS_X86_DARWIN) -callgrind_x86_darwin_LDADD = $(TOOL_LDADD_X86_DARWIN) -callgrind_x86_darwin_LDFLAGS = $(TOOL_LDFLAGS_X86_DARWIN) - -callgrind_amd64_darwin_SOURCES = $(CALLGRIND_SOURCES_COMMON) $(CALLGRIND_SOURCES_AMD64) -callgrind_amd64_darwin_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -callgrind_amd64_darwin_CFLAGS = $(CALLGRIND_CFLAGS_COMMON) $(AM_CFLAGS_AMD64_DARWIN) -callgrind_amd64_darwin_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_DARWIN) -callgrind_amd64_darwin_LDADD = $(TOOL_LDADD_AMD64_DARWIN) -callgrind_amd64_darwin_LDFLAGS = $(TOOL_LDFLAGS_AMD64_DARWIN) Modified: branches/BUILD_TWEAKS/lackey/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/lackey/Makefile.am 2009-06-13 00:37:53 UTC (rev 10314) +++ branches/BUILD_TWEAKS/lackey/Makefile.am 2009-06-13 00:50:38 UTC (rev 10315) @@ -1,85 +1,38 @@ include $(top_srcdir)/Makefile.tool.am -noinst_PROGRAMS = -if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -noinst_PROGRAMS += lackey-x86-linux +#---------------------------------------------------------------------------- +# lackey-<platform> +#---------------------------------------------------------------------------- + +noinst_PROGRAMS = lackey-@VGCONF_ARCH_PRI@-@VGCONF_OS@ +if VGCONF_HAVE_PLATFORM_SEC +noinst_PROGRAMS += lackey-@VGCONF_ARCH_SEC@-@VGCONF_OS@ endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -noinst_PROGRAMS += lackey-amd64-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -noinst_PROGRAMS += lackey-ppc32-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -noinst_PROGRAMS += lackey-ppc64-linux -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -noinst_PROGRAMS += lackey-ppc32-aix5 -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -noinst_PROGRAMS += lackey-ppc64-aix5 -endif -if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN -noinst_PROGRAMS += lackey-x86-darwin -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN -noinst_PROGRAMS += lackey-amd64-darwin -endif LACKEY_SOURCES_COMMON = lk_main.c -lackey_x86_linux_SOURCES = $(LACKEY_SOURCES_COMMON) -lackey_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -lackey_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) -lackey_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) -lackey_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) -lackey_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) +lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(LACKEY_SOURCES_COMMON) +lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_PRI_CAPS@) +lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) +lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +if VGCONF_HAVE_PLATFORM_SEC +lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(LACKEY_SOURCES_COMMON) +lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ + $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \ + $(COREGRIND_LIBS_@VGCONF_PLATFORM_SEC_CAPS@) +lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ + $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) +lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ + $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +endif -lackey_amd64_linux_SOURCES = $(LACKEY_SOURCES_COMMON) -lackey_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -lackey_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -lackey_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) -lackey_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) -lackey_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) - -lackey_ppc32_linux_SOURCES = $(LACKEY_SOURCES_COMMON) -lackey_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -lackey_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -lackey_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) -lackey_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) -lackey_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) - -lackey_ppc64_linux_SOURCES = $(LACKEY_SOURCES_COMMON) -lackey_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -lackey_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -lackey_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) -lackey_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) -lackey_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) - -lackey_ppc32_aix5_SOURCES = $(LACKEY_SOURCES_COMMON) -lackey_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -lackey_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -lackey_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) -lackey_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) -lackey_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) - -lackey_ppc64_aix5_SOURCES = $(LACKEY_SOURCES_COMMON) -lackey_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -lackey_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -lackey_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) -lackey_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) -lackey_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) - -lackey_x86_darwin_SOURCES = $(LACKEY_SOURCES_COMMON) -lackey_x86_darwin_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) -lackey_x86_darwin_CFLAGS = $(AM_CFLAGS_X86_DARWIN) -lackey_x86_darwin_DEPENDENCIES = $(COREGRIND_LIBS_X86_DARWIN) -lackey_x86_darwin_LDADD = $(TOOL_LDADD_X86_DARWIN) -lackey_x86_darwin_LDFLAGS = $(TOOL_LDFLAGS_X86_DARWIN) - -lackey_amd64_darwin_SOURCES = $(LACKEY_SOURCES_COMMON) -lackey_amd64_darwin_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) -lackey_amd64_darwin_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) -lackey_amd64_darwin_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_DARWIN) -lackey_amd64_darwin_LDADD = $(TOOL_LDADD_AMD64_DARWIN) -lackey_amd64_darwin_LDFLAGS = $(TOOL_LDFLAGS_AMD64_DARWIN) |
