Skip to content

Commit

Permalink
fix for distcheck on intel-14.0, may leave a.outs around
Browse files Browse the repository at this point in the history
  • Loading branch information
benkirk committed Jan 24, 2014
1 parent 14155ff commit 3d6a7bf
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
3 changes: 2 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 = \
Expand Down
10 changes: 5 additions & 5 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions contrib/netcdf/4.3.0/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand All @@ -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
Expand Down Expand Up @@ -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 '+-------------------------------------------------------------+'
Expand Down
6 changes: 3 additions & 3 deletions contrib/netcdf/4.3.0/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand All @@ -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
Expand Down Expand Up @@ -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 '+-------------------------------------------------------------+'
Expand Down

0 comments on commit 3d6a7bf

Please sign in to comment.