|
From: <sv...@va...> - 2009-06-15 05:30:11
|
Author: njn Date: 2009-06-15 06:30:05 +0100 (Mon, 15 Jun 2009) New Revision: 10328 Log: Remove some duplicated DSYM handling code. Modified: branches/BUILD_TWEAKS/Makefile.core-tool.am branches/BUILD_TWEAKS/Makefile.tool-tests.am Modified: branches/BUILD_TWEAKS/Makefile.core-tool.am =================================================================== --- branches/BUILD_TWEAKS/Makefile.core-tool.am 2009-06-15 05:17:22 UTC (rev 10327) +++ branches/BUILD_TWEAKS/Makefile.core-tool.am 2009-06-15 05:30:05 UTC (rev 10328) @@ -1,7 +1,13 @@ # This file contains things shared by coregrind/Makefile.am and tool -# Makefile.am files. Also auxprogs/Makefile.am. +# Makefile.am and test/Makefile.am files. Also auxprogs/Makefile.am. -# See Makefile.tool-tests.am for an explanation of dSYMs. +# On Darwin, for a program 'p', the DWARF debug info is stored in the +# directory 'p.dSYM'. This must be generated after the executable is +# created, with 'dsymutil p'. We could redefine LINK with a script that +# executes 'dsymutil' after linking, but that's a pain. Instead we use this +# hook so that every time "make check" is run, we subsequently invoke +# 'dsymutil' on all the executables that lack a .dSYM directory, or that are +# newer than their corresponding .dSYM directory. build-noinst_DSYMS: for f in $(noinst_DSYMS); do \ if [ ! -e $$f.dSYM -o $$f -nt $$f.dSYM ] ; then \ Modified: branches/BUILD_TWEAKS/Makefile.tool-tests.am =================================================================== --- branches/BUILD_TWEAKS/Makefile.tool-tests.am 2009-06-15 05:17:22 UTC (rev 10327) +++ branches/BUILD_TWEAKS/Makefile.tool-tests.am 2009-06-15 05:30:05 UTC (rev 10328) @@ -1,6 +1,7 @@ # This file is used for tool tests, and also in perf/Makefile.am. -include $(top_srcdir)/Makefile.flags.am # For AM_FLAG_M3264_PRI +include $(top_srcdir)/Makefile.flags.am # For AM_FLAG_M3264_PRI +include $(top_srcdir)/Makefile.core-tool.am # For *-noinst_DSYM targets AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \ -I$(top_srcdir)/coregrind -I$(top_builddir)/include \ @@ -16,25 +17,11 @@ # automake; see comments in Makefile.flags.am for more detail. AM_CCASFLAGS = $(AM_CPPFLAGS) - -# On Darwin, for a program 'p', the DWARF debug info is stored in the -# directory 'p.dSYM'. This must be generated after the executable is -# created, with 'dsymutil p'. We could redefine LINK with a script that -# executes 'dsymutil' after linking, but that's a pain. Instead we use this -# hook so that every time "make check" is run, we subsequently invoke -# 'dsymutil' on all the executables that lack a .dSYM directory, or that are -# newer than their corresponding .dSYM directory. +# This sets if VGCONF_OS_IS_DARWIN -check-local: - for f in $(check_PROGRAMS) ; do \ - if [ ! -e $$f.dSYM -o $$f -nt $$f.dSYM ] ; then \ - echo "dsymutil $$f"; \ - dsymutil $$f; \ - fi \ - done +noinst_DSYMS = $(check_PROGRAMS) +endif -clean-local: - for f in $(check_PROGRAMS) ; do \ - rm -rf $$f.dSYM; \ - done -endif +check-local: build-noinst_DSYMS + +clean-local: clean-noinst_DSYMS |