From 3d6a7bf14ef8fc5a3edd14a0116a45b36bbeaea7 Mon Sep 17 00:00:00 2001 From: "Benjamin S. Kirk" Date: Fri, 24 Jan 2014 10:00:17 -0600 Subject: [PATCH] fix for distcheck on intel-14.0, may leave a.outs around --- Makefile.am | 3 ++- Makefile.in | 10 +++++----- contrib/netcdf/4.3.0/Makefile.am | 6 +++--- contrib/netcdf/4.3.0/Makefile.in | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index cf954fa7e60..53b5456cc4b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,7 +116,8 @@ beautify: # Additional files to be deleted by 'make distclean' # _configs.sed seems to be leftover by prefix_config DISTCLEANFILES = \ - _configs.sed + _configs.sed \ + a.out # intel-14.0 seems to leave an a.out from configure with mpich, clean that up for distclean # # Additional files to be deleted by 'make maintainer-clean' # MAINTAINERCLEANFILES = \ diff --git a/Makefile.in b/Makefile.in index 5c455b39a5e..a2d259c913d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,10 +76,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(top_srcdir)/contrib/utils/libmesh-opt.pc.in \ $(top_srcdir)/contrib/utils/libmesh-prof.pc.in \ $(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/dot.in AUTHORS \ - COPYING ChangeLog INSTALL NEWS build-aux/compile \ - build-aux/config.guess build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/ltmain.sh build-aux/missing \ - build-aux/ylwrap + COPYING ChangeLog INSTALL NEWS build-aux/config.guess \ + build-aux/config.sub build-aux/depcomp build-aux/install-sh \ + build-aux/ltmain.sh build-aux/missing build-aux/ylwrap @LIBMESH_DBG_MODE_TRUE@am__append_1 = libmesh_dbg.la @LIBMESH_DEVEL_MODE_TRUE@am__append_2 = libmesh_devel.la @LIBMESH_OPT_MODE_TRUE@am__append_3 = libmesh_opt.la @@ -4381,7 +4380,8 @@ libmesh_config_SCRIPTS = contrib/bin/libmesh-config # Additional files to be deleted by 'make distclean' # _configs.sed seems to be leftover by prefix_config DISTCLEANFILES = \ - _configs.sed + _configs.sed \ + a.out # intel-14.0 seems to leave an a.out from configure with mpich, clean that up for distclean # Do not edit - automatically generated from ./rebuild_libmesh_SOURCES.sh diff --git a/contrib/netcdf/4.3.0/Makefile.am b/contrib/netcdf/4.3.0/Makefile.am index 57b92ed6526..154ae1b677f 100644 --- a/contrib/netcdf/4.3.0/Makefile.am +++ b/contrib/netcdf/4.3.0/Makefile.am @@ -83,7 +83,7 @@ endif # This is the list of subdirs for which Makefiles will be constructed # and run. ncgen must come before ncdump, because their tests -# depend on it. +# depend on it. SUBDIRS = include $(OCLIB) $(H5_TEST_DIR) libdispatch libsrc \ $(LIBSRC4_DIR) $(DAP2) $(LIBCDMR) $(LIBRPC) liblib \ $(NCGEN3) $(NCGEN) $(NCDUMP) \ @@ -92,7 +92,7 @@ man4 $(EXAMPLES) \ $(UDUNITS) $(LIBCF) # Remove these generated files, for a distclean. -DISTCLEANFILES = VERSION comps.txt test_prog +DISTCLEANFILES = VERSION comps.txt test_prog a.out # The nc-config script helps the user build programs with netCDF. bin_SCRIPTS = nc-config @@ -164,7 +164,7 @@ endif # BUILD_DLL @echo '| http://www.unidata.ucar.edu/software/netcdf/ |' @echo '| |' @echo '| NetCDF is developed and maintained at the Unidata Program |' - @echo '| Center. Unidata provides a broad array of data and software |' + @echo '| Center. Unidata provides a broad array of data and software |' @echo '| tools for use in geoscience education and research. |' @echo '| http://www.unidata.ucar.edu |' @echo '+-------------------------------------------------------------+' diff --git a/contrib/netcdf/4.3.0/Makefile.in b/contrib/netcdf/4.3.0/Makefile.in index d8575b7eece..807297ebf4c 100644 --- a/contrib/netcdf/4.3.0/Makefile.in +++ b/contrib/netcdf/4.3.0/Makefile.in @@ -391,7 +391,7 @@ pkgconfig_DATA = netcdf.pc # This is the list of subdirs for which Makefiles will be constructed # and run. ncgen must come before ncdump, because their tests -# depend on it. +# depend on it. SUBDIRS = include $(OCLIB) $(H5_TEST_DIR) libdispatch libsrc \ $(LIBSRC4_DIR) $(DAP2) $(LIBCDMR) $(LIBRPC) liblib \ $(NCGEN3) $(NCGEN) $(NCDUMP) \ @@ -401,7 +401,7 @@ $(UDUNITS) $(LIBCF) # Remove these generated files, for a distclean. -DISTCLEANFILES = VERSION comps.txt test_prog +DISTCLEANFILES = VERSION comps.txt test_prog a.out # The nc-config script helps the user build programs with netCDF. bin_SCRIPTS = nc-config @@ -1031,7 +1031,7 @@ install-data-hook: @echo '| http://www.unidata.ucar.edu/software/netcdf/ |' @echo '| |' @echo '| NetCDF is developed and maintained at the Unidata Program |' - @echo '| Center. Unidata provides a broad array of data and software |' + @echo '| Center. Unidata provides a broad array of data and software |' @echo '| tools for use in geoscience education and research. |' @echo '| http://www.unidata.ucar.edu |' @echo '+-------------------------------------------------------------+'