- removed invalid wildcard from EXTRA_DIST (fixes broken 'make distcheck')

- extended 'make uninstall' rules to remove symbolic links (e.g. vtcxx, vtCC, otfdecompress)

This commit was SVN r24811.

ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/Makefile.am

@@ -8,6 +8,8 @@ bin_PROGRAMS = otfcompress
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir); rm -f otfdecompress; \
 	$(LN_S) otfcompress$(EXEEXT) otfdecompress$(EXEEXT))
+uninstall-local:
+	rm -f $(DESTDIR)$(bindir)/otfdecompress$(EXEEXT)
 endif
 
 otfcompress_LDADD = $(top_builddir)/otflib/libotf.la

ompi/contrib/vt/vt/tools/vtsetup/Makefile.am

@@ -16,5 +16,5 @@ EXTRA_DIST = \
 	vtsetup-data.dtd \
 	ChangeLog \
 	README \
-	src/vtsetup-*.src.tar.gz
+	src/vtsetup-1.0.src.tar.gz
 

ompi/contrib/vt/vt/tools/vtwrapper/Makefile.am

@@ -25,12 +25,20 @@ bin_LINKS = \
 	@CROSS_PREFIX@vtf90$(EXEEXT) \
 	$(bin_LINK_vtnvcc)
 
-install-exec-hook:
+install-exec-hook-always:
 	(cd $(DESTDIR)$(bindir); \
 	for l in $(bin_LINKS); do \
 		rm -f $$l; $(LN_S) @CROSS_PREFIX@vtwrapper$(EXEEXT) $$l; \
 	done)
+uninstall-local-exec-always:
+	(cd $(DESTDIR)$(bindir); \
+	for l in $(bin_LINKS); do \
+		rm -f $$l; \
+	done)
 
+else # AMBUILDBINARIES
+install-exec-hook-always:
+uninstall-local-exec-always:
 endif # AMBUILDBINARIES
 
 if AMBUILDVTNVCC
@@ -58,14 +66,19 @@ install-data-hook-always:
 	(cd $(DESTDIR)$(datadir); \
 	rm -f @CROSS_PREFIX@vtcxx-wrapper-data.txt; \
 	$(LN_S) @CROSS_PREFIX@vtc++-wrapper-data.txt @CROSS_PREFIX@vtcxx-wrapper-data.txt)
+uninstall-local-data-always:
+	rm -f $(DESTDIR)$(datadir)/@CROSS_PREFIX@vtcxx-wrapper-data.txt
 
 if AMHAVECSFS
 install-data-hook-1:
 	(cd $(DESTDIR)$(datadir); \
 	rm -f @CROSS_PREFIX@vtCC-wrapper-data.txt; \
 	$(LN_S) @CROSS_PREFIX@vtc++-wrapper-data.txt @CROSS_PREFIX@vtCC-wrapper-data.txt)
+uninstall-local-data-1:
+	rm -f $(DESTDIR)$(datadir)/@CROSS_PREFIX@vtCC-wrapper-data.txt
 else # AMHAVECSFS
 install-data-hook-1:
+uninstall-local-data-1:
 endif # AMHAVECSFS
 
 if AMMACOS
@@ -75,7 +88,9 @@ else # AMMACOS
 install-data-hook-2:
 endif # AMMACOS
 
+install-exec-hook: install-exec-hook-always
 install-data-hook: install-data-hook-always install-data-hook-1 install-data-hook-2
+uninstall-local: uninstall-local-exec-always uninstall-local-data-always uninstall-local-data-1
 
 if AMHAVEF77
 HAVEF77CXXFLAGS = -DHAVE_F77