diff options
| author | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-05-29 05:40:33 +0000 |
|---|---|---|
| committer | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-05-29 05:40:33 +0000 |
| commit | 477924109e0fb8f9c95a08da08389fcba1b09ae7 (patch) | |
| tree | b20f36443ba70c1fee5fa0f8ba35a279a1652e07 | |
| parent | 58c2ff9dacdc1f98fb875407e6fa4269d8be9243 (diff) | |
| download | valgrind-477924109e0fb8f9c95a08da08389fcba1b09ae7.tar.gz | |
Partly de-hackify auxprogs/Makefile.am. libmpiwrap.*.*.dSYM is now
installed on Darwin. Installation and cleaning are more in line with the
other Makefile.am files.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10167 a5019735-40e9-0310-863c-91ae7b9d1cf9
| -rw-r--r-- | Makefile.core-tool.am | 2 | ||||
| -rw-r--r-- | auxprogs/Makefile.am | 33 |
2 files changed, 14 insertions, 21 deletions
diff --git a/Makefile.core-tool.am b/Makefile.core-tool.am index 493e8c369..b4fc2751c 100644 --- a/Makefile.core-tool.am +++ b/Makefile.core-tool.am @@ -1,5 +1,5 @@ # This file contains things shared by coregrind/Makefile.am and tool -# Makefile.am files. +# Makefile.am files. Also auxprogs/Makefile.am. # See Makefile.tool-tests.am for an explanation of dSYMs. build-noinst_DSYMS: diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am index df59b7429..eef28d362 100644 --- a/auxprogs/Makefile.am +++ b/auxprogs/Makefile.am @@ -1,5 +1,6 @@ include $(top_srcdir)/Makefile.all.am include $(top_srcdir)/Makefile.flags.am +include $(top_srcdir)/Makefile.core-tool.am bin_PROGRAMS = valgrind-listener @@ -67,15 +68,22 @@ endif ## First, we have to say how to build the .so's .. ## noinst_PROGRAMS = +noinst_DSYMS = if BUILD_MPIWRAP_PRI -noinst_PROGRAMS += libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so +noinst_PROGRAMS += libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so +if VGCONF_OS_IS_DARWIN +noinst_DSYMS += libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so +endif libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so: libmpiwrap.c $(MPI_CC) $(HACKY_FLAGS_PRI) \ -I../include \ -o libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so libmpiwrap.c endif if BUILD_MPIWRAP_SEC -noinst_PROGRAMS += libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so +noinst_PROGRAMS += libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so +if VGCONF_OS_IS_DARWIN +noinst_DSYMS += libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so +endif libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so: libmpiwrap.c $(MPI_CC) $(HACKY_FLAGS_SEC) \ -I../include \ @@ -89,15 +97,9 @@ endif # Hence force -j 1. .NOTPARALLEL: -install-exec-local: -if BUILD_MPIWRAP_PRI - $(mkinstalldirs) $(DESTDIR)$(valdir); \ - $(INSTALL_PROGRAM) ./libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so $(DESTDIR)$(valdir); -endif -if BUILD_MPIWRAP_SEC - $(mkinstalldirs) $(DESTDIR)$(valdir); \ - $(INSTALL_PROGRAM) ./libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so $(DESTDIR)$(valdir); -endif +clean-local: clean-noinst_DSYMS + +install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS ## And some hacks to keep 'make dist' happy. @@ -121,15 +123,6 @@ libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c: touch libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c endif -## cleanery -clean-local: - rm -f libmpiwrap-.c \ - libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.c \ - libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c -if VGCONF_OS_IS_DARWIN - rm -rf libmpiwrap-*.dSYM -endif - # #---------------------------------------------------------- |