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 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/auxprogs/Makefile.am b/auxprogs/Makefile.am
index 28f97b5..e554e9c 100644
--- a/auxprogs/Makefile.am
+++ b/auxprogs/Makefile.am
@@ -105,26 +105,32 @@
 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
+
 #
 #----------------------------------------------------------