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

diff --git a/Makefile.core-tool.am b/Makefile.core-tool.am
index 493e8c36909d410f5df5dcb9e5272d91891b8dbc..b4fc2751c1b145a31590ea2ba62402233979f445 100644 (file)
--- 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 df59b7429a7a76dff64d98e0d33eec19c1162db9..eef28d362ea35cbde1d5dff57a0d8aeb9efcb278 100644 (file)
--- 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
-
 #
 #----------------------------------------------------------