Horrible hacks to make 'make dist' work properly. Previously it only

worked on systems when the configure script found a usable mpicc,
bizarrely.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6634

diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index 28f97b5f6a9ac6f4c77bf71f53e4fb7c75917392..e554e9c16d437bc8e7227fdf722de99ebf68ede1 100644 (file)
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -105,26 +105,32 @@ if BUILD_MPIWRAP_SEC
 endif
 
 
-## And some hacks for 'make dist'
+## And some hacks to keep 'make dist' happy.
 ## It would seem that using nodist_SOURCES is the right fix, but
 ## I can't figure out how to do it.
 ##
-if BUILD_MPIWRAP_PRI
 #nodist_SOURCES        = libmpiwrap-@VG_PLATFORM_PRI@.c
-libmpiwrap-@VG_PLATFORM_PRI@.c:
-       rm -f libmpiwrap-@VG_PLATFORM_PRI@.c
-       touch libmpiwrap-@VG_PLATFORM_PRI@.c
+#nodist_SOURCES        = libmpiwrap-@VG_PLATFORM_SEC@.c
+
 libmpiwrap-.c:
        rm -f libmpiwrap-.c
        touch libmpiwrap-.c
-endif
-if BUILD_MPIWRAP_SEC
-#nodist_SOURCES        = libmpiwrap-@VG_PLATFORM_SEC@.c
+
+libmpiwrap-@VG_PLATFORM_PRI@.c:
+       rm -f libmpiwrap-@VG_PLATFORM_PRI@.c
+       touch libmpiwrap-@VG_PLATFORM_PRI@.c
+
+if VGP_HAVE_SECONDARY
 libmpiwrap-@VG_PLATFORM_SEC@.c:
        rm -f libmpiwrap-@VG_PLATFORM_SEC@.c
        touch libmpiwrap-@VG_PLATFORM_SEC@.c
 endif
 
+## cleanery
+clean-local:
+       rm -f libmpiwrap-.c \
+       libmpiwrap-@VG_PLATFORM_PRI@.c libmpiwrap-@VG_PLATFORM_SEC@.c
+
 #
 #----------------------------------------------------------