diff --git a/Makefile.am b/Makefile.am
index dc08f3faf..1142f724d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -636,4 +636,3 @@ include $(top_srcdir)/doc/Makefile.mk
 # use the _TARGETS var as a workaround for being unable to define multiple
 # -local targets
 install-data-local: $(INSTALL_DATA_LOCAL_TARGETS)
-
diff --git a/confdb/aclocal_coverage.m4 b/confdb/aclocal_coverage.m4
index ce949d40a..844beb509 100644
--- a/confdb/aclocal_coverage.m4
+++ b/confdb/aclocal_coverage.m4
@@ -87,4 +87,3 @@ if test "$enable_coverage" = "yes" ; then
 fi
 AM_CONDITIONAL([BUILD_COVERAGE],[test "X$pac_cv_use_coverage" = "Xyes"])
 ])
-
diff --git a/confdb/aclocal_shl.m4 b/confdb/aclocal_shl.m4
index f974bfa22..e3f548f1c 100644
--- a/confdb/aclocal_shl.m4
+++ b/confdb/aclocal_shl.m4
@@ -497,4 +497,3 @@ PAC_POP_FLAG([CC])
 
 AC_MSG_RESULT([done (results in $2)])
 ])
-
diff --git a/confdb/aclocal_subcfg.m4 b/confdb/aclocal_subcfg.m4
index 53fb78e3d..fbd1899f4 100644
--- a/confdb/aclocal_subcfg.m4
+++ b/confdb/aclocal_subcfg.m4
@@ -258,4 +258,3 @@ dnl
 dnl This is useful for reducing copy-paste errors when defining PREREQ and BODY
 dnl macros.  If you tinker with this macro, watch the quoting carefully.
 AC_DEFUN([PAC_SUBCFG_AUTO_SUFFIX],[m4_translit(m4_bpatsubst(m4_dquote(__file__),[/[^/]+.m4],[]),[/],[_])])
-
diff --git a/contrib/README b/contrib/README
index 7e458be07..a0b1aa9db 100644
--- a/contrib/README
+++ b/contrib/README
@@ -2,4 +2,3 @@ This directory contains non-essential code that complements MPICH but
 is not part of MPICH itself.  Code in this directory may have a
 different license and copyright than MPICH and should be explained in
 each subdirectory.
-
diff --git a/contrib/knem/README b/contrib/knem/README
index b4c7429cf..2d36240d0 100644
--- a/contrib/knem/README
+++ b/contrib/knem/README
@@ -12,4 +12,3 @@ configure MPICH with the following arguments:
 Where (:net_mod) indicates an optional network module parameter such as
 tcp or mx.  Omitting a netmod will select the default netmod ("tcp" as
 of the time of this writing).
-
diff --git a/doc/Makefile.mk b/doc/Makefile.mk
index dc0a2c4c7..3a02adb86 100644
--- a/doc/Makefile.mk
+++ b/doc/Makefile.mk
@@ -27,4 +27,3 @@ install-devdocs:
 	        export DEV_INSTALL_PREFIX ; \
 	        ( cd $$dir && $(MAKE) install-devdocs ) ; \
 	done
-
diff --git a/doc/mansrc/mpiconsts.txt b/doc/mansrc/mpiconsts.txt
index 4e7b741d6..6c1f976be 100644
--- a/doc/mansrc/mpiconsts.txt
+++ b/doc/mansrc/mpiconsts.txt
@@ -543,5 +543,3 @@ Error codes for MPI_T:
  values(s)
 
 D*/
-
-
diff --git a/doc/mpiman.def b/doc/mpiman.def
index 668c46ba2..4f296bee4 100644
--- a/doc/mpiman.def
+++ b/doc/mpiman.def
@@ -8,4 +8,3 @@ nop begingroup 0
 nop endgroup 0
 name mpichversion 0 1.0.3
 nop scriptsize
-
diff --git a/doc/namepub/Makefile b/doc/namepub/Makefile
index 36c1a09d6..271e9714b 100644
--- a/doc/namepub/Makefile
+++ b/doc/namepub/Makefile
@@ -38,5 +38,3 @@ install-devdocs: namepub.pdf
 	-fig2dev -L eps -l landscape $*.fig > $*.eps
 	if [ ! -s $*.eps ] ; then \
 		fig2dev -L ps -l landscape $*.fig > $*.eps ; fi
-
-
diff --git a/doc/notes/Agenda.txt b/doc/notes/Agenda.txt
index 43234d4a6..209238544 100644
--- a/doc/notes/Agenda.txt
+++ b/doc/notes/Agenda.txt
@@ -16,4 +16,3 @@ the next thing to do:
 - work through a scenario using this whole layered design
 
 - rinse and repeat for a collective scenario
-
diff --git a/doc/notes/agent/agent.txt b/doc/notes/agent/agent.txt
index 543bc218d..a45ad67f2 100644
--- a/doc/notes/agent/agent.txt
+++ b/doc/notes/agent/agent.txt
@@ -1299,5 +1299,3 @@ Open Issues:
   avoid buffer copies?
 
 - Need to define the communication agent
-
-
diff --git a/doc/notes/agent/outline.txt b/doc/notes/agent/outline.txt
index 351cc8767..c0da46d74 100644
--- a/doc/notes/agent/outline.txt
+++ b/doc/notes/agent/outline.txt
@@ -155,4 +155,3 @@
 
 
   - matching incoming messages to requests
-
diff --git a/doc/notes/coll/collective.txt b/doc/notes/coll/collective.txt
index 6a516c590..f4afd7f80 100644
--- a/doc/notes/coll/collective.txt
+++ b/doc/notes/coll/collective.txt
@@ -266,4 +266,3 @@ recv_mop can be used for accumulate
 
 send_mop could cause remote operations to occur.  We will not use send_mop 
 currently.
-
diff --git a/doc/notes/mpi.txt b/doc/notes/mpi.txt
index 94ef1a5d8..25b2dc855 100644
--- a/doc/notes/mpi.txt
+++ b/doc/notes/mpi.txt
@@ -368,5 +368,3 @@ Connection resolution
 ----------
 
 Communication agent
-
-
diff --git a/doc/notes/rma/dm-mt.c b/doc/notes/rma/dm-mt.c
index 6b10f31c1..abd32931e 100644
--- a/doc/notes/rma/dm-mt.c
+++ b/doc/notes/rma/dm-mt.c
@@ -174,4 +174,3 @@ MPID_Win_get_hdlr(header)
     {
     }
 }
-
diff --git a/doc/notes/rma/dm-mt.txt b/doc/notes/rma/dm-mt.txt
index 60e17137d..c97d4f195 100644
--- a/doc/notes/rma/dm-mt.txt
+++ b/doc/notes/rma/dm-mt.txt
@@ -16,7 +16,3 @@ MPID_Win_fence(assert,win)
 * Atomically move the remote handler call counters to a buffer and
   zero the counters.  This ensures that the 
 ------------------------------------------------------------------------
-
-
-
-
diff --git a/doc/notes/rma/dm.c b/doc/notes/rma/dm.c
index 334713f60..9319cf2ba 100644
--- a/doc/notes/rma/dm.c
+++ b/doc/notes/rma/dm.c
@@ -261,5 +261,3 @@ MPIDI_Win_acc_eager_hdlr(src, comm, (header,(data,data_sz)))
     dwin->rhc_processed++;
 }
 /* MPIDI_Win_acc_eager_hdlr() */
-
-
diff --git a/doc/notes/rma/gen.txt b/doc/notes/rma/gen.txt
index 863095380..5190ae43a 100644
--- a/doc/notes/rma/gen.txt
+++ b/doc/notes/rma/gen.txt
@@ -81,4 +81,3 @@
 Optimizations
 
 * merge synchronization with RMA ops when sending messages
-
diff --git a/doc/notes/rma/passive-dm.txt b/doc/notes/rma/passive-dm.txt
index 95908e1f0..d7ac0d48c 100644
--- a/doc/notes/rma/passive-dm.txt
+++ b/doc/notes/rma/passive-dm.txt
@@ -40,5 +40,3 @@ MPID_Win_unlock
 ------------------------------------------------------------------------
 
 MPID_Accumulate
-
-
diff --git a/doc/notes/rma/pt-rma.txt b/doc/notes/rma/pt-rma.txt
index 3e18f8ca6..959ff77b1 100644
--- a/doc/notes/rma/pt-rma.txt
+++ b/doc/notes/rma/pt-rma.txt
@@ -82,4 +82,3 @@ or the get data is sent over. Except in the case of get operations,
 Win_unlock must block until it receives an acknowledgement from the
 target that the RMA operation has completed (for both shared and
 exclusive locks). 
-
diff --git a/doc/notes/rma/shm.txt b/doc/notes/rma/shm.txt
index 1491ada20..f67df159e 100644
--- a/doc/notes/rma/shm.txt
+++ b/doc/notes/rma/shm.txt
@@ -154,4 +154,3 @@ MPID_shm_Accumulate
  * Unlock target local window
 
 ------------------------------------------------------------------------
-
diff --git a/doc/pmi/Makefile b/doc/pmi/Makefile
index fe9bc1d17..7096d31a4 100644
--- a/doc/pmi/Makefile
+++ b/doc/pmi/Makefile
@@ -100,4 +100,3 @@ install-devdocs: pmi.pdf
 	-fig2dev -L eps -l landscape $*.fig > $*.eps
 	if [ ! -s $*.eps ] ; then \
 		fig2dev -L ps -l landscape $*.fig > $*.eps ; fi
-
diff --git a/doc/pmi/paper.bib b/doc/pmi/paper.bib
index 4d71167b8..a1f8d8027 100644
--- a/doc/pmi/paper.bib
+++ b/doc/pmi/paper.bib
@@ -2,4 +2,3 @@
   key   = {mpich},
   title = {http://www.mcs.anl.gov/mpi/mpich}
 }
-
diff --git a/doc/userguide/user.tex.vin b/doc/userguide/user.tex.vin
index 95334aa65..e089bd13e 100644
--- a/doc/userguide/user.tex.vin
+++ b/doc/userguide/user.tex.vin
@@ -599,5 +599,3 @@ here:\url{http://wiki.mpich.org/mpich/index.php/Frequently_Asked_Questions}
 \bibliography{user}
 
 \end{document}
-
-
diff --git a/examples/README b/examples/README
index b1fabbd52..e3958cc18 100644
--- a/examples/README
+++ b/examples/README
@@ -49,4 +49,3 @@ Running the pmandel* programs
 
 
 Others will be documented later.
-
diff --git a/examples/developers/README b/examples/developers/README
index 3d5c512cf..86c90bf3b 100644
--- a/examples/developers/README
+++ b/examples/developers/README
@@ -1,4 +1,3 @@
 This directory contains programs that may be useful for developers.  These
 are not example programs; rather, they may be used to explore the 
 behavior of the MPI implemenation in some special cases.
-
diff --git a/examples/f90/pi3f90.f90 b/examples/f90/pi3f90.f90
index facc61ce5..17c2f9575 100644
--- a/examples/f90/pi3f90.f90
+++ b/examples/f90/pi3f90.f90
@@ -79,7 +79,3 @@ program main
  call MPI_FINALIZE(rc)
  stop
 end
-
-
-
-
diff --git a/maint/Makefile.mk b/maint/Makefile.mk
index 83a9572da..7f739b2d2 100644
--- a/maint/Makefile.mk
+++ b/maint/Makefile.mk
@@ -53,4 +53,3 @@ dist_noinst_DATA +=                        \
 ### TODO FIXME what do we do about these?
 ##makedefs
 ##sampleconf.in
-
diff --git a/maint/docnotes b/maint/docnotes
index 736f4ca18..f4c8a754c 100644
--- a/maint/docnotes
+++ b/maint/docnotes
@@ -557,4 +557,3 @@ N*/
  the routines 'MPI_Add_error_class' and 'MPI_Add_error_code' that allow the
  user to define and use MPI error codes and classes.
 N*/
-
diff --git a/maint/extracterrmsgs b/maint/extracterrmsgs
index 96a7d99e4..05c401d74 100755
--- a/maint/extracterrmsgs
+++ b/maint/extracterrmsgs
@@ -900,4 +900,3 @@ sub ExpandDir {
 # layer, forcing all routines to document all MPI error classes that they might
 # return (this is like requiring routines to document the exceptions that 
 # they may throw).
-
diff --git a/maint/findunusederrtxt b/maint/findunusederrtxt
index 9af273ba7..46e0f058f 100755
--- a/maint/findunusederrtxt
+++ b/maint/findunusederrtxt
@@ -28,4 +28,3 @@ foreach $errname (sort(keys(%errkeys))) {
     }
     close FDG;
 }
-
diff --git a/maint/gen_subcfg_m4 b/maint/gen_subcfg_m4
index 49b05fe03..cc709ab94 100755
--- a/maint/gen_subcfg_m4
+++ b/maint/gen_subcfg_m4
@@ -372,4 +372,3 @@ sub cmp_arrays {
         }
     }
 }
-
diff --git a/maint/getfuncstack.in b/maint/getfuncstack.in
index 7c2cff669..43988a214 100644
--- a/maint/getfuncstack.in
+++ b/maint/getfuncstack.in
@@ -144,4 +144,3 @@ sub indent {
     }
     return $spaces;
 }
-
diff --git a/maint/testpmpi b/maint/testpmpi
index 8e67cb047..38118465c 100755
--- a/maint/testpmpi
+++ b/maint/testpmpi
@@ -81,5 +81,3 @@ foreach $key (keys(%routine_names)) {
 }
 print OFD "}\n";
 close OFD;
-
-
diff --git a/src/binding/cxx/Makefile.mk b/src/binding/cxx/Makefile.mk
index 0a02dd1f1..a8625c7bd 100644
--- a/src/binding/cxx/Makefile.mk
+++ b/src/binding/cxx/Makefile.mk
@@ -45,4 +45,3 @@ mpicovsimple.o: mpicovsimple.cxx mpicovsimple.h
 endif BUILD_COVERAGE
 
 endif BUILD_CXX_BINDING
-
diff --git a/src/binding/cxx/c2.dat b/src/binding/cxx/c2.dat
index 665f45afc..3c29b1575 100644
--- a/src/binding/cxx/c2.dat
+++ b/src/binding/cxx/c2.dat
@@ -413,4 +413,3 @@ void Status::Set_error(int error)
 
 # B.11 MPI-1.2
 void Get_version(int& version, int& subversion)
-
diff --git a/src/env/mpicxx.bash.in b/src/env/mpicxx.bash.in
index b671f7745..7d47ec692 100644
--- a/src/env/mpicxx.bash.in
+++ b/src/env/mpicxx.bash.in
@@ -252,4 +252,3 @@ else
 fi
 
 exit $rc
-
diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in
index cf63bdad7..88ff655e7 100644
--- a/src/env/mpicxx.sh.in
+++ b/src/env/mpicxx.sh.in
@@ -261,4 +261,3 @@ else
 fi
 
 exit $rc
-
diff --git a/src/env/mpif77.bash.in b/src/env/mpif77.bash.in
index de6d1f538..97a91bdc2 100644
--- a/src/env/mpif77.bash.in
+++ b/src/env/mpif77.bash.in
@@ -315,4 +315,3 @@ if [ -n "$rmfiles" ] ; then
     rm -f $rmfiles
 fi
 exit $rc
-
diff --git a/src/env/mpif77.sh.in b/src/env/mpif77.sh.in
index 47105126c..ae5b45c4c 100644
--- a/src/env/mpif77.sh.in
+++ b/src/env/mpif77.sh.in
@@ -337,4 +337,3 @@ if [ -n "$rmfiles" ] ; then
     rm -f $rmfiles
 fi
 exit $rc
-
diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in
index 96aba33ab..6016caa9f 100644
--- a/src/env/mpifort.sh.in
+++ b/src/env/mpifort.sh.in
@@ -372,4 +372,3 @@ if [ -n "$rmfiles" ] ; then
     rm -f $rmfiles
 fi
 exit $rc
-
diff --git a/src/env/rmshm b/src/env/rmshm
index 78e5882a4..dc99b0fca 100755
--- a/src/env/rmshm
+++ b/src/env/rmshm
@@ -68,5 +68,3 @@ fi
 #
 # mpirun could call this for systems that use SYSV shared memory features,
 # just to keep them friendly.
-
-
diff --git a/src/glue/Makefile.mk b/src/glue/Makefile.mk
index 2c39596f9..1a0b855ac 100644
--- a/src/glue/Makefile.mk
+++ b/src/glue/Makefile.mk
@@ -6,4 +6,3 @@
 ##
 
 include $(top_srcdir)/src/glue/romio/Makefile.mk
-
diff --git a/src/mpi/coll/allreduce/Makefile.mk b/src/mpi/coll/allreduce/Makefile.mk
index 20bfd36aa..12500e731 100644
--- a/src/mpi/coll/allreduce/Makefile.mk
+++ b/src/mpi/coll/allreduce/Makefile.mk
@@ -21,4 +21,3 @@ mpi_core_sources +=											\
     src/mpi/coll/allreduce/allreduce_intra_reduce_scatter_allgather.c	\
     src/mpi/coll/allreduce/allreduce_intra_smp.c	\
     src/mpi/coll/allreduce/allreduce_inter_reduce_exchange_bcast.c
-
diff --git a/src/mpi/coll/iallgather/Makefile.mk b/src/mpi/coll/iallgather/Makefile.mk
index 629646bee..114726e20 100644
--- a/src/mpi/coll/iallgather/Makefile.mk
+++ b/src/mpi/coll/iallgather/Makefile.mk
@@ -20,4 +20,3 @@ mpi_core_sources +=                                         \
     src/mpi/coll/iallgather/iallgather_intra_brucks.c             \
     src/mpi/coll/iallgather/iallgather_intra_ring.c               \
     src/mpi/coll/iallgather/iallgather_inter_local_gather_remote_bcast.c
-
diff --git a/src/mpi/coll/iexscan/Makefile.mk b/src/mpi/coll/iexscan/Makefile.mk
index 3f7dbf9a3..00664e6a2 100644
--- a/src/mpi/coll/iexscan/Makefile.mk
+++ b/src/mpi/coll/iexscan/Makefile.mk
@@ -17,4 +17,3 @@ mpi_sources +=                                  \
 
 mpi_core_sources +=                        \
     src/mpi/coll/iexscan/iexscan_intra_recursive_doubling.c
-
diff --git a/src/mpi/coll/igather/Makefile.mk b/src/mpi/coll/igather/Makefile.mk
index 9e51d80aa..7f5745758 100644
--- a/src/mpi/coll/igather/Makefile.mk
+++ b/src/mpi/coll/igather/Makefile.mk
@@ -19,4 +19,3 @@ mpi_core_sources +=                          \
     src/mpi/coll/igather/igather_intra_binomial.c  \
     src/mpi/coll/igather/igather_inter_short.c \
     src/mpi/coll/igather/igather_inter_long.c
-
diff --git a/src/mpi/coll/igatherv/Makefile.mk b/src/mpi/coll/igatherv/Makefile.mk
index de26463ba..cb9f24b96 100644
--- a/src/mpi/coll/igatherv/Makefile.mk
+++ b/src/mpi/coll/igatherv/Makefile.mk
@@ -17,4 +17,3 @@ mpi_sources +=                                  \
 
 mpi_core_sources +=                          \
     src/mpi/coll/igatherv/igatherv_allcomm_linear.c
-
diff --git a/src/mpi/coll/neighbor_alltoall/Makefile.mk b/src/mpi/coll/neighbor_alltoall/Makefile.mk
index 60aff118b..31db15ef4 100644
--- a/src/mpi/coll/neighbor_alltoall/Makefile.mk
+++ b/src/mpi/coll/neighbor_alltoall/Makefile.mk
@@ -17,4 +17,3 @@ mpi_sources += \
 
 mpi_core_sources += \
     src/mpi/coll/neighbor_alltoall/neighbor_alltoall_allcomm_nb.c
-
diff --git a/src/mpi/datatype/Makefile.mk b/src/mpi/datatype/Makefile.mk
index a5cc33989..0b224d91e 100644
--- a/src/mpi/datatype/Makefile.mk
+++ b/src/mpi/datatype/Makefile.mk
@@ -70,4 +70,3 @@ mpi_core_sources +=                              \
     src/mpi/datatype/type_create_pairtype.c      \
     src/mpi/datatype/type_debug.c                \
     src/mpi/datatype/type_flatten.c
-
diff --git a/src/mpi/datatype/dataloop/Makefile.mk b/src/mpi/datatype/dataloop/Makefile.mk
index 00bdb16fc..68f19b241 100644
--- a/src/mpi/datatype/dataloop/Makefile.mk
+++ b/src/mpi/datatype/dataloop/Makefile.mk
@@ -25,4 +25,3 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/mpi/datatype
 
 noinst_HEADERS +=                                        \
     src/mpi/datatype/dataloop/typesize_support.h
-
diff --git a/src/mpi/debugger/Makefile.mk b/src/mpi/debugger/Makefile.mk
index 104793f82..076391bdb 100644
--- a/src/mpi/debugger/Makefile.mk
+++ b/src/mpi/debugger/Makefile.mk
@@ -48,4 +48,3 @@ src/mpi/debugger/allcommdbg: src/mpi/debugger/allcommdbg.c
 	$(bindir)/mpicc -o $@ $?
 
 endif BUILD_DEBUGGER_DLL
-
diff --git a/src/mpi/errhan/Makefile.mk b/src/mpi/errhan/Makefile.mk
index a08c9f3a8..ce4a64e25 100644
--- a/src/mpi/errhan/Makefile.mk
+++ b/src/mpi/errhan/Makefile.mk
@@ -66,5 +66,3 @@ $(top_srcdir)/src/mpi/errhan/defmsg.h: $(top_srcdir)/maint/errmsgdirs $(errnames
 	( cd $(top_srcdir) && test -s .tmp && mv .tmp src/mpi/errhan/defmsg.h )
 
 endif MAINTAINER_MODE
-
-
diff --git a/src/mpi/group/Makefile.mk b/src/mpi/group/Makefile.mk
index 2cd3975be..b89d91de0 100644
--- a/src/mpi/group/Makefile.mk
+++ b/src/mpi/group/Makefile.mk
@@ -23,4 +23,3 @@ mpi_core_sources += \
     src/mpi/group/grouputil.c
 
 noinst_HEADERS += src/mpi/group/group.h
-
diff --git a/src/mpi/init/Makefile.mk b/src/mpi/init/Makefile.mk
index 646011792..488c64ad5 100644
--- a/src/mpi/init/Makefile.mk
+++ b/src/mpi/init/Makefile.mk
@@ -20,4 +20,3 @@ mpi_core_sources += \
     src/mpi/init/async.c
 
 noinst_HEADERS += src/mpi/init/mpi_init.h
-
diff --git a/src/mpi/pt2pt/Makefile.mk b/src/mpi/pt2pt/Makefile.mk
index 5fd789572..3de746097 100644
--- a/src/mpi/pt2pt/Makefile.mk
+++ b/src/mpi/pt2pt/Makefile.mk
@@ -36,4 +36,3 @@ mpi_core_sources += \
     src/mpi/pt2pt/bsendutil.c
 
 noinst_HEADERS += src/mpi/pt2pt/bsendutil.h
-
diff --git a/src/mpi/rma/Makefile.mk b/src/mpi/rma/Makefile.mk
index 0762314e7..3f04817c8 100644
--- a/src/mpi/rma/Makefile.mk
+++ b/src/mpi/rma/Makefile.mk
@@ -50,4 +50,3 @@ mpi_sources +=                          \
 mpi_core_sources += \
     src/mpi/rma/winutil.c         \
     src/mpi/rma/rmatypeutil.c
-
diff --git a/src/mpi/romio/adio/Makefile.mk b/src/mpi/romio/adio/Makefile.mk
index e78916774..e9776da48 100644
--- a/src/mpi/romio/adio/Makefile.mk
+++ b/src/mpi/romio/adio/Makefile.mk
@@ -37,4 +37,3 @@ include $(top_srcdir)/adio/ad_ufs/Makefile.mk
 include $(top_srcdir)/adio/ad_xfs/Makefile.mk
 include $(top_srcdir)/adio/ad_ime/Makefile.mk
 include $(top_srcdir)/adio/common/Makefile.mk
-
diff --git a/src/mpi/romio/adio/ad_ime/Makefile.mk b/src/mpi/romio/adio/ad_ime/Makefile.mk
index f56c65e30..f520e78be 100644
--- a/src/mpi/romio/adio/ad_ime/Makefile.mk
+++ b/src/mpi/romio/adio/ad_ime/Makefile.mk
@@ -22,4 +22,3 @@ romio_other_sources +=                    \
     adio/ad_ime/ad_ime_features.c
 
 endif BUILD_AD_IME
-
diff --git a/src/mpi/romio/adio/ad_lustre/Makefile.mk b/src/mpi/romio/adio/ad_lustre/Makefile.mk
index 43eaa025b..e7ace7537 100644
--- a/src/mpi/romio/adio/ad_lustre/Makefile.mk
+++ b/src/mpi/romio/adio/ad_lustre/Makefile.mk
@@ -19,4 +19,3 @@ romio_other_sources +=                   \
     adio/ad_lustre/ad_lustre_aggregate.c
 
 endif BUILD_AD_LUSTRE
-
diff --git a/src/mpi/romio/adio/ad_nfs/Makefile.mk b/src/mpi/romio/adio/ad_nfs/Makefile.mk
index ca25e20cb..0a661d874 100644
--- a/src/mpi/romio/adio/ad_nfs/Makefile.mk
+++ b/src/mpi/romio/adio/ad_nfs/Makefile.mk
@@ -25,4 +25,3 @@ romio_other_sources +=            \
     adio/ad_nfs/ad_nfs_features.c
 
 endif BUILD_AD_NFS
-
diff --git a/src/mpi/romio/adio/ad_panfs/Makefile.mk b/src/mpi/romio/adio/ad_panfs/Makefile.mk
index ad412d9bb..99e213013 100644
--- a/src/mpi/romio/adio/ad_panfs/Makefile.mk
+++ b/src/mpi/romio/adio/ad_panfs/Makefile.mk
@@ -25,4 +25,3 @@ romio_other_sources +=              \
     adio/ad_panfs/ad_panfs_write.c
 
 endif BUILD_AD_PANFS
-
diff --git a/src/mpi/romio/adio/ad_pvfs2/Makefile.mk b/src/mpi/romio/adio/ad_pvfs2/Makefile.mk
index 73906f679..387fccbac 100644
--- a/src/mpi/romio/adio/ad_pvfs2/Makefile.mk
+++ b/src/mpi/romio/adio/ad_pvfs2/Makefile.mk
@@ -32,4 +32,3 @@ romio_other_sources +=                          \
     adio/ad_pvfs2/ad_pvfs2_features.c
 
 endif BUILD_AD_PVFS2
-
diff --git a/src/mpi/romio/adio/ad_testfs/Makefile.mk b/src/mpi/romio/adio/ad_testfs/Makefile.mk
index 7f9c61721..1fcfc5b41 100644
--- a/src/mpi/romio/adio/ad_testfs/Makefile.mk
+++ b/src/mpi/romio/adio/ad_testfs/Makefile.mk
@@ -29,4 +29,3 @@ romio_other_sources +=                \
     adio/ad_testfs/ad_testfs.c
 
 endif BUILD_AD_TESTFS
-
diff --git a/src/mpi/romio/adio/ad_ufs/Makefile.mk b/src/mpi/romio/adio/ad_ufs/Makefile.mk
index 40ecdb4ae..a149fb030 100644
--- a/src/mpi/romio/adio/ad_ufs/Makefile.mk
+++ b/src/mpi/romio/adio/ad_ufs/Makefile.mk
@@ -14,4 +14,3 @@ romio_other_sources +=        \
     adio/ad_ufs/ad_ufs_open.c
 
 endif BUILD_AD_UFS
-
diff --git a/src/mpi/romio/adio/ad_xfs/Makefile.mk b/src/mpi/romio/adio/ad_xfs/Makefile.mk
index 9a2d7078a..bfe739218 100644
--- a/src/mpi/romio/adio/ad_xfs/Makefile.mk
+++ b/src/mpi/romio/adio/ad_xfs/Makefile.mk
@@ -19,4 +19,3 @@ romio_other_sources +=          \
     adio/ad_xfs/ad_xfs_write.c
 
 endif BUILD_AD_XFS
-
diff --git a/src/mpi/romio/adio/common/Makefile.mk b/src/mpi/romio/adio/common/Makefile.mk
index e7d2af7f6..824253da3 100644
--- a/src/mpi/romio/adio/common/Makefile.mk
+++ b/src/mpi/romio/adio/common/Makefile.mk
@@ -74,4 +74,3 @@ romio_other_sources +=                  \
     adio/common/onesided_aggregation.c  \
     adio/common/ad_tuning.c             \
     adio/common/utils.c
-
diff --git a/src/mpi/romio/mpi-io/Makefile.mk b/src/mpi/romio/mpi-io/Makefile.mk
index 275cb9891..8953c84e0 100644
--- a/src/mpi/romio/mpi-io/Makefile.mk
+++ b/src/mpi/romio/mpi-io/Makefile.mk
@@ -106,4 +106,3 @@ endif BUILD_MPIO_REQUEST
 if BUILD_MPIO_ERRHAN
 romio_other_sources += $(mpio_request_sources)
 endif BUILD_MPIO_ERRHAN
-
diff --git a/src/mpi/romio/mpi-io/fortran/Makefile.mk b/src/mpi/romio/mpi-io/fortran/Makefile.mk
index f7ed72b69..9bb6e8634 100644
--- a/src/mpi/romio/mpi-io/fortran/Makefile.mk
+++ b/src/mpi/romio/mpi-io/fortran/Makefile.mk
@@ -65,4 +65,3 @@ romio_mpi_sources +=              \
     mpi-io/fortran/writef.c
 
 endif BUILD_F77_BINDINGS
-
diff --git a/src/mpi/romio/mpi-io/glue/default/Makefile.mk b/src/mpi/romio/mpi-io/glue/default/Makefile.mk
index 96995410b..e17445c40 100644
--- a/src/mpi/romio/mpi-io/glue/default/Makefile.mk
+++ b/src/mpi/romio/mpi-io/glue/default/Makefile.mk
@@ -10,4 +10,3 @@ romio_other_sources +=              \
     mpi-io/glue/default/mpio_file.c \
     mpi-io/glue/default/mpio_err.c
 endif MPIO_GLUE_DEFAULT
-
diff --git a/src/mpi/romio/mpi-io/glue/openmpi/Makefile.mk b/src/mpi/romio/mpi-io/glue/openmpi/Makefile.mk
index ab7c15078..1960ba9e6 100644
--- a/src/mpi/romio/mpi-io/glue/openmpi/Makefile.mk
+++ b/src/mpi/romio/mpi-io/glue/openmpi/Makefile.mk
@@ -10,4 +10,3 @@ romio_other_sources +=              \
     mpi-io/glue/openmpi/mpio_file.c \
     mpi-io/glue/openmpi/mpio_err.c
 endif MPIO_GLUE_OPENMPI
-
diff --git a/src/mpi/spawn/Makefile.mk b/src/mpi/spawn/Makefile.mk
index e66d2acfd..a1c550326 100644
--- a/src/mpi/spawn/Makefile.mk
+++ b/src/mpi/spawn/Makefile.mk
@@ -22,4 +22,3 @@ noinst_HEADERS += src/mpi/spawn/namepub.h
 
 # for namepub.h, which is included by some other dirs
 AM_CPPFLAGS += -I$(top_srcdir)/src/mpi/spawn
-
diff --git a/src/mpi_t/Makefile.mk b/src/mpi_t/Makefile.mk
index c193ebc02..91cf1dc7c 100644
--- a/src/mpi_t/Makefile.mk
+++ b/src/mpi_t/Makefile.mk
@@ -40,4 +40,3 @@ mpi_sources +=                \
 
 
 mpi_core_sources += src/mpi_t/mpit.c
-
diff --git a/src/mpid/ch3/Makefile.mk b/src/mpid/ch3/Makefile.mk
index b5503fb54..2e201c97c 100644
--- a/src/mpid/ch3/Makefile.mk
+++ b/src/mpid/ch3/Makefile.mk
@@ -30,4 +30,3 @@ include $(top_srcdir)/src/mpid/ch3/util/Makefile.mk
 include $(top_srcdir)/src/mpid/ch3/channels/Makefile.mk
 
 endif BUILD_CH3
-
diff --git a/src/mpid/ch3/channels/nemesis/Makefile.mk b/src/mpid/ch3/channels/nemesis/Makefile.mk
index 597d86eac..3e86db5c7 100644
--- a/src/mpid/ch3/channels/nemesis/Makefile.mk
+++ b/src/mpid/ch3/channels/nemesis/Makefile.mk
@@ -33,4 +33,3 @@ include $(top_srcdir)/src/mpid/ch3/channels/nemesis/utils/monitor/Makefile.mk
 include $(top_srcdir)/src/mpid/ch3/channels/nemesis/utils/replacements/Makefile.mk
 
 endif BUILD_CH3_NEMESIS
-
diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/llc/Makefile.mk
index 2adb70927..900992ac0 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/llc/Makefile.mk
+++ b/src/mpid/ch3/channels/nemesis/netmod/llc/Makefile.mk
@@ -24,4 +24,3 @@ noinst_HEADERS +=							\
 	$(EOA)
 
 endif BUILD_NEMESIS_NETMOD_LLC
-
diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/mxm/Makefile.mk
index 597758bdb..71a641af7 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/Makefile.mk
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/Makefile.mk
@@ -19,4 +19,3 @@ noinst_HEADERS +=                                           \
     src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h
 
 endif BUILD_NEMESIS_NETMOD_MXM
-
diff --git a/src/mpid/ch3/channels/nemesis/netmod/none/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/none/Makefile.mk
index 83a98ea03..3e1c4a8d9 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/none/Makefile.mk
+++ b/src/mpid/ch3/channels/nemesis/netmod/none/Makefile.mk
@@ -7,4 +7,3 @@
 
 mpi_core_sources +=                                \
     src/mpid/ch3/channels/nemesis/netmod/none/none.c
-
diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/portals4/Makefile.mk
index 8237dc230..972246eeb 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/Makefile.mk
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/Makefile.mk
@@ -24,4 +24,3 @@ noinst_HEADERS +=                                                \
     src/mpid/ch3/channels/nemesis/netmod/portals4/rptl.h
 
 endif BUILD_NEMESIS_NETMOD_PORTALS4
-
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/tcp/Makefile.mk
index 2183e8cc0..a9455a1d5 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/Makefile.mk
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/Makefile.mk
@@ -22,4 +22,3 @@ noinst_HEADERS +=                                                \
     src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_queue.h
 
 endif BUILD_NEMESIS_NETMOD_TCP
-
diff --git a/src/mpid/ch3/channels/nemesis/src/Makefile.mk b/src/mpid/ch3/channels/nemesis/src/Makefile.mk
index 58ade2732..afde281be 100644
--- a/src/mpid/ch3/channels/nemesis/src/Makefile.mk
+++ b/src/mpid/ch3/channels/nemesis/src/Makefile.mk
@@ -29,4 +29,3 @@ mpi_core_sources +=				\
     src/mpid/ch3/channels/nemesis/src/mpid_nem_net_array.c	\
     src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c	\
     src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_vmsplice.c
-
diff --git a/src/mpid/ch3/channels/nemesis/utils/Makefile.mk b/src/mpid/ch3/channels/nemesis/utils/Makefile.mk
index eabd19468..82ed8d4bf 100644
--- a/src/mpid/ch3/channels/nemesis/utils/Makefile.mk
+++ b/src/mpid/ch3/channels/nemesis/utils/Makefile.mk
@@ -7,4 +7,3 @@
 
 include $(top_srcdir)/src/mpid/ch3/channels/nemesis/utils/monitor/Makefile.mk
 include $(top_srcdir)/src/mpid/ch3/channels/nemesis/utils/replacements/Makefile.mk
-
diff --git a/src/mpid/ch3/channels/nemesis/utils/monitor/Makefile.mk b/src/mpid/ch3/channels/nemesis/utils/monitor/Makefile.mk
index 640b5cda0..9a554e384 100644
--- a/src/mpid/ch3/channels/nemesis/utils/monitor/Makefile.mk
+++ b/src/mpid/ch3/channels/nemesis/utils/monitor/Makefile.mk
@@ -13,4 +13,3 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/mpid/ch3/channels/nemesis/utils/monitor
 noinst_HEADERS +=                                                      \
     src/mpid/ch3/channels/nemesis/utils/monitor/my_papi_defs.h \
     src/mpid/ch3/channels/nemesis/utils/monitor/rdtsc.h
-
diff --git a/src/mpid/ch3/channels/nemesis/utils/replacements/Makefile.mk b/src/mpid/ch3/channels/nemesis/utils/replacements/Makefile.mk
index c9ad004dc..ed2ba23d1 100644
--- a/src/mpid/ch3/channels/nemesis/utils/replacements/Makefile.mk
+++ b/src/mpid/ch3/channels/nemesis/utils/replacements/Makefile.mk
@@ -7,4 +7,3 @@
 
 mpi_core_sources +=                                          \
     src/mpid/ch3/channels/nemesis/utils/replacements/mkstemp.c
-
diff --git a/src/mpid/ch3/channels/sock/Makefile.mk b/src/mpid/ch3/channels/sock/Makefile.mk
index cb4073f5d..a74e4e132 100644
--- a/src/mpid/ch3/channels/sock/Makefile.mk
+++ b/src/mpid/ch3/channels/sock/Makefile.mk
@@ -19,4 +19,3 @@ noinst_HEADERS +=                                       \
     src/mpid/ch3/channels/sock/include/mpidi_ch3_post.h
 
 endif BUILD_CH3_SOCK
-
diff --git a/src/mpid/ch3/channels/sock/src/Makefile.mk b/src/mpid/ch3/channels/sock/src/Makefile.mk
index 331642b42..d627d2379 100644
--- a/src/mpid/ch3/channels/sock/src/Makefile.mk
+++ b/src/mpid/ch3/channels/sock/src/Makefile.mk
@@ -27,4 +27,3 @@ noinst_HEADERS += \
     src/mpid/ch3/channels/sock/include/mpidu_socki.h
 
 endif BUILD_CH3_SOCK
-
diff --git a/src/mpid/ch3/src/Makefile.mk b/src/mpid/ch3/src/Makefile.mk
index 71e8d6dbe..c122c4c86 100644
--- a/src/mpid/ch3/src/Makefile.mk
+++ b/src/mpid/ch3/src/Makefile.mk
@@ -62,4 +62,3 @@ mpi_core_sources +=                          \
     src/mpid/ch3/src/mpidi_isend_self.c                    \
     src/mpid/ch3/src/mpidi_pg.c                            \
     src/mpid/ch3/src/mpidi_printf.c
-
diff --git a/src/mpid/ch3/util/Makefile.mk b/src/mpid/ch3/util/Makefile.mk
index 6bb76c7c6..fc7b6e988 100644
--- a/src/mpid/ch3/util/Makefile.mk
+++ b/src/mpid/ch3/util/Makefile.mk
@@ -10,4 +10,3 @@
 
 include $(top_srcdir)/src/mpid/ch3/util/sock/Makefile.mk
 include $(top_srcdir)/src/mpid/ch3/util/ftb/Makefile.mk
-
diff --git a/src/mpid/ch3/util/ftb/Makefile.mk b/src/mpid/ch3/util/ftb/Makefile.mk
index 02222b393..a5ba68cb2 100644
--- a/src/mpid/ch3/util/ftb/Makefile.mk
+++ b/src/mpid/ch3/util/ftb/Makefile.mk
@@ -13,4 +13,3 @@ mpi_core_sources +=    \
     src/mpid/ch3/util/ftb/ftb.c
 
 endif BUILD_CH3_UTIL_FTB
-
diff --git a/src/mpid/common/sched/Makefile.mk b/src/mpid/common/sched/Makefile.mk
index 660bc784e..1b61210a6 100644
--- a/src/mpid/common/sched/Makefile.mk
+++ b/src/mpid/common/sched/Makefile.mk
@@ -19,4 +19,3 @@ noinst_HEADERS +=                          \
 
 
 endif BUILD_MPID_COMMON_SCHED
-
diff --git a/src/nameserv/Makefile.mk b/src/nameserv/Makefile.mk
index 8cd739e1d..599af5438 100644
--- a/src/nameserv/Makefile.mk
+++ b/src/nameserv/Makefile.mk
@@ -7,4 +7,3 @@
 
 include $(top_srcdir)/src/nameserv/file/Makefile.mk
 include $(top_srcdir)/src/nameserv/pmi/Makefile.mk
-
diff --git a/src/nameserv/file/Makefile.mk b/src/nameserv/file/Makefile.mk
index f3b455ed8..8b3acc66d 100644
--- a/src/nameserv/file/Makefile.mk
+++ b/src/nameserv/file/Makefile.mk
@@ -11,4 +11,3 @@ mpi_core_sources +=   \
     src/nameserv/file/file_nameserv.c
 
 endif BUILD_NAMEPUB_FILE
-
diff --git a/src/nameserv/pmi/Makefile.mk b/src/nameserv/pmi/Makefile.mk
index fee93ce53..bf2c0fc73 100644
--- a/src/nameserv/pmi/Makefile.mk
+++ b/src/nameserv/pmi/Makefile.mk
@@ -11,4 +11,3 @@ mpi_core_sources +=   \
     src/nameserv/pmi/pmi_nameserv.c
 
 endif BUILD_NAMEPUB_PMI
-
diff --git a/src/packaging/Makefile.mk b/src/packaging/Makefile.mk
index edb246475..3beb2989b 100644
--- a/src/packaging/Makefile.mk
+++ b/src/packaging/Makefile.mk
@@ -7,4 +7,3 @@
 
 include $(top_srcdir)/src/packaging/pkgconfig/Makefile.mk
 include $(top_srcdir)/src/packaging/envmods/Makefile.mk
-
diff --git a/src/packaging/pkgconfig/Makefile.mk b/src/packaging/pkgconfig/Makefile.mk
index 932a8edbd..b13253d93 100644
--- a/src/packaging/pkgconfig/Makefile.mk
+++ b/src/packaging/pkgconfig/Makefile.mk
@@ -6,4 +6,3 @@
 ##
 
 nodist_pkgconfig_DATA += src/packaging/pkgconfig/mpich.pc
-
diff --git a/src/pm/gforker/Makefile.mk b/src/pm/gforker/Makefile.mk
index f0e9d968d..2575aa94d 100644
--- a/src/pm/gforker/Makefile.mk
+++ b/src/pm/gforker/Makefile.mk
@@ -39,4 +39,3 @@ endif BUILD_PM_GFORKER
 ##doc_HTML_SOURCES  = ${doc_sources}
 ##doc_MAN_SOURCES   = ${doc_sources}
 ##doc_LATEX_SOURCES = ${doc_sources}
-
diff --git a/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk b/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk
index ea66342ea..7d6198ed6 100644
--- a/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk
+++ b/src/pm/hydra/tools/ckpoint/blcr/Makefile.mk
@@ -7,4 +7,3 @@
 libhydra_la_SOURCES += tools/ckpoint/blcr/ckpoint_blcr.c
 
 noinst_HEADERS += tools/ckpoint/blcr/ckpoint_blcr.h
-
diff --git a/src/pm/hydra/ui/utils/Makefile.mk b/src/pm/hydra/ui/utils/Makefile.mk
index 5b51ad520..bb6c9e2f3 100644
--- a/src/pm/hydra/ui/utils/Makefile.mk
+++ b/src/pm/hydra/ui/utils/Makefile.mk
@@ -7,4 +7,3 @@
 libhydra_la_SOURCES += ui/utils/uiu.c
 
 noinst_HEADERS += ui/utils/uiu.h
-
diff --git a/src/pm/remshell/Makefile.mk b/src/pm/remshell/Makefile.mk
index e32d6e2d7..cba400e62 100644
--- a/src/pm/remshell/Makefile.mk
+++ b/src/pm/remshell/Makefile.mk
@@ -31,4 +31,3 @@ EXTRA_src_pm_remshell_mpiexec_remshell_DEPENDENCIES = $(mpllib)
 src_pm_remshell_mpiexec_remshell_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS)
 endif !PRIMARY_PM_REMSHELL
 endif BUILD_PM_REMSHELL
-
diff --git a/src/pm/util/Makefile.mk b/src/pm/util/Makefile.mk
index d9429f9c7..96612c8ec 100644
--- a/src/pm/util/Makefile.mk
+++ b/src/pm/util/Makefile.mk
@@ -54,4 +54,3 @@ src_pm_util_libmpiexec_la_SOURCES = \
     src/pm/util/simple_pmiutil2.c
 
 endif BUILD_PM_UTIL
-
diff --git a/src/pmi/Makefile.mk b/src/pmi/Makefile.mk
index c8e0f42af..b298d904d 100644
--- a/src/pmi/Makefile.mk
+++ b/src/pmi/Makefile.mk
@@ -9,4 +9,3 @@ include $(top_srcdir)/src/pmi/pmi2/Makefile.mk
 include $(top_srcdir)/src/pmi/simple/Makefile.mk
 
 errnames_txt_files += src/pmi/errnames.txt
-
diff --git a/src/pmi/simple/Makefile.mk b/src/pmi/simple/Makefile.mk
index b6234fbaa..16320c1c2 100644
--- a/src/pmi/simple/Makefile.mk
+++ b/src/pmi/simple/Makefile.mk
@@ -19,4 +19,3 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/pmi/simple
 AM_CPPFLAGS += -I$(top_srcdir)/src/pmi/include
 
 endif BUILD_PMI_SIMPLE
-
diff --git a/src/util/assert/Makefile.mk b/src/util/assert/Makefile.mk
index 7fa6594e2..d57493a86 100644
--- a/src/util/assert/Makefile.mk
+++ b/src/util/assert/Makefile.mk
@@ -6,4 +6,3 @@
 ##
 
 mpi_core_sources += src/util/assert/assert.c
-
diff --git a/src/util/logging/Makefile.mk b/src/util/logging/Makefile.mk
index a80a8f43e..8bb398108 100644
--- a/src/util/logging/Makefile.mk
+++ b/src/util/logging/Makefile.mk
@@ -13,4 +13,3 @@ include $(top_srcdir)/src/util/logging/rlog/Makefile.mk
 # "slog_api" conditionally existed in Makefile.sm, but doesn't seem to be
 # present in the current source tree, so this is commented out for now
 #include $(top_srcdir)/src/util/logging/slog_api/Makefile.mk
-
diff --git a/src/util/logging/common/Makefile.mk b/src/util/logging/common/Makefile.mk
index efcb1e48b..36dfe55c8 100644
--- a/src/util/logging/common/Makefile.mk
+++ b/src/util/logging/common/Makefile.mk
@@ -15,4 +15,3 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/util/logging/common
 # FIXME XXX DJG this file is autogenerated, right?  how do we correctly express
 # the dependency on the "extractstates" generator code?
 noinst_HEADERS += src/util/logging/common/state_names.h
-
diff --git a/src/util/logging/rlog/Makefile.mk b/src/util/logging/rlog/Makefile.mk
index 6f5473d1f..8641f3bc4 100644
--- a/src/util/logging/rlog/Makefile.mk
+++ b/src/util/logging/rlog/Makefile.mk
@@ -32,4 +32,3 @@ src_util_logging_rlog_printrlog_LDADD      = lib/librlogutil.la
 #src_util_logging_rlog_minalignrlog_SOURCES = src/util/logging/rlog/minalignrlog.c $(irlog_sources)
 
 endif BUILD_LOGGING_RLOG
-
diff --git a/src/util/procmap/Makefile.mk b/src/util/procmap/Makefile.mk
index 58b43fa6e..df744b0d3 100644
--- a/src/util/procmap/Makefile.mk
+++ b/src/util/procmap/Makefile.mk
@@ -7,4 +7,3 @@
 
 mpi_core_sources +=   \
     src/util/procmap/local_proc.c
-
diff --git a/src/util/wrappers/Makefile.mk b/src/util/wrappers/Makefile.mk
index 6cfe1ee22..738329f5b 100644
--- a/src/util/wrappers/Makefile.mk
+++ b/src/util/wrappers/Makefile.mk
@@ -11,4 +11,3 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/util/wrappers -I$(top_builddir)/src/util/wrap
 noinst_HEADERS +=                             \
     src/util/wrappers/mpiu_sock_wrappers.h    \
     src/util/wrappers/mpiu_util_wrappers.h
-
diff --git a/test/mpi/f77/attr/Makefile.am b/test/mpi/f77/attr/Makefile.am
index cd54053eb..b6995198f 100644
--- a/test/mpi/f77/attr/Makefile.am
+++ b/test/mpi/f77/attr/Makefile.am
@@ -28,4 +28,3 @@ commattr3f.$(OBJEXT): attraints.h
 typeattrf.$(OBJEXT): attraints.h
 typeattr2f.$(OBJEXT): attraints.h
 typeattr3f.$(OBJEXT): attraints.h
-
diff --git a/test/mpi/f77/attr/baseattrf.f b/test/mpi/f77/attr/baseattrf.f
index 36f520d85..193dec176 100644
--- a/test/mpi/f77/attr/baseattrf.f
+++ b/test/mpi/f77/attr/baseattrf.f
@@ -60,4 +60,3 @@ C
       call MPI_Finalize( ierr )
 
       end
-
diff --git a/test/mpi/f77/comm/Makefile.am b/test/mpi/f77/comm/Makefile.am
index 6529cc408..43c11235d 100644
--- a/test/mpi/f77/comm/Makefile.am
+++ b/test/mpi/f77/comm/Makefile.am
@@ -13,4 +13,3 @@ EXTRA_DIST = testlist
 AM_DEFAULT_SOURCE_EXT = .f
 
 noinst_PROGRAMS = commnamef commerrf
-
diff --git a/test/mpi/f77/ext/Makefile.am b/test/mpi/f77/ext/Makefile.am
index 18ec7aa60..0be94ba55 100644
--- a/test/mpi/f77/ext/Makefile.am
+++ b/test/mpi/f77/ext/Makefile.am
@@ -30,4 +30,3 @@ allocmemf.$(OBJEXT): add1size.h
 # we don't get this from Makefile_f77.mtest and we don't include Makefile.mtest
 $(top_builddir)/util/mtest.o:
 	(cd $(top_builddir)/util && $(MAKE) mtest.o)
-
diff --git a/test/mpi/f77/info/Makefile.am b/test/mpi/f77/info/Makefile.am
index 4efabb633..a7354fcfd 100644
--- a/test/mpi/f77/info/Makefile.am
+++ b/test/mpi/f77/info/Makefile.am
@@ -13,4 +13,3 @@ EXTRA_DIST = testlist
 AM_DEFAULT_SOURCE_EXT = .f
 
 noinst_PROGRAMS = infotestf infotest2f
-
diff --git a/test/mpi/f77/init/Makefile.am b/test/mpi/f77/init/Makefile.am
index e9c1c9f7c..232f98e02 100644
--- a/test/mpi/f77/init/Makefile.am
+++ b/test/mpi/f77/init/Makefile.am
@@ -23,4 +23,3 @@ checksizes_LDADD =
 nodist_checksizes_SOURCES = checksizes.c
 
 DISTCLEANFILES = checksizes.c
-
diff --git a/test/mpi/f77/io/Makefile.am b/test/mpi/f77/io/Makefile.am
index f4bf095ef..c282dbd3e 100644
--- a/test/mpi/f77/io/Makefile.am
+++ b/test/mpi/f77/io/Makefile.am
@@ -147,4 +147,3 @@ clean-local:
 	-rm -f .iotest.txt.*
 
 DISTCLEANFILES = $(generated_io_sources)
-
diff --git a/test/mpi/f77/io/i_setviewcurf.f b/test/mpi/f77/io/i_setviewcurf.f
index ae090260a..5e12d7943 100644
--- a/test/mpi/f77/io/i_setviewcurf.f
+++ b/test/mpi/f77/io/i_setviewcurf.f
@@ -117,4 +117,3 @@ C   All processes must provide the same file view for MODE_SEQUENTIAL
 
       call MTest_Finalize( errs )
       end
-
diff --git a/test/mpi/f77/io/setviewcurf.f b/test/mpi/f77/io/setviewcurf.f
index 444a3b3f9..0a3558ddb 100644
--- a/test/mpi/f77/io/setviewcurf.f
+++ b/test/mpi/f77/io/setviewcurf.f
@@ -114,4 +114,3 @@ C   All processes must provide the same file view for MODE_SEQUENTIAL
       call MTest_Finalize( errs )
 
       end
-
diff --git a/test/mpi/f77/profile/Makefile.am b/test/mpi/f77/profile/Makefile.am
index e55eaad70..e7e280c7e 100644
--- a/test/mpi/f77/profile/Makefile.am
+++ b/test/mpi/f77/profile/Makefile.am
@@ -18,4 +18,3 @@ noinst_PROGRAMS = profile1f
 
 # ensure that dependent tests will be rebuilt when typeaints.h is updated
 greqf.$(OBJEXT): attr1aints.h
-
diff --git a/test/mpi/f77/pt2pt/Makefile.am b/test/mpi/f77/pt2pt/Makefile.am
index 16f6e2336..95823e9f8 100644
--- a/test/mpi/f77/pt2pt/Makefile.am
+++ b/test/mpi/f77/pt2pt/Makefile.am
@@ -43,4 +43,3 @@ greqf_SOURCES = greqf.f dummyf.f
 
 # ensure that dependent tests will be rebuilt when typeaints.h is updated
 greqf.$(OBJEXT): attr1aints.h
-
diff --git a/test/mpi/f77/rma/Makefile.am b/test/mpi/f77/rma/Makefile.am
index 491ea2107..20fe1d96f 100644
--- a/test/mpi/f77/rma/Makefile.am
+++ b/test/mpi/f77/rma/Makefile.am
@@ -57,4 +57,3 @@ winscale2f.$(OBJEXT): addsize.h
 ## not sure how accurate it is.
 # bindir may be used in MPIEXEC, so make sure it is defined
 BINDIR=${bindir}
-
diff --git a/test/mpi/f77/spawn/Makefile.am b/test/mpi/f77/spawn/Makefile.am
index 36e61190b..46e37e125 100644
--- a/test/mpi/f77/spawn/Makefile.am
+++ b/test/mpi/f77/spawn/Makefile.am
@@ -22,4 +22,3 @@ spawnmult2f.$(OBJEXT): type1aint.h
 # add "-lU77" (or equivalent) to the link line for these tests that use getarg
 spawnargvf_LDADD = $(LDADD) $(F77_GETARG_LIBS)
 spawnmultf_LDADD = $(LDADD) $(F77_GETARG_LIBS)
-
diff --git a/test/mpi/f77/topo/Makefile.am b/test/mpi/f77/topo/Makefile.am
index ffc081015..92ad5ec42 100644
--- a/test/mpi/f77/topo/Makefile.am
+++ b/test/mpi/f77/topo/Makefile.am
@@ -13,4 +13,3 @@ EXTRA_DIST = testlist
 AM_DEFAULT_SOURCE_EXT = .f
 
 noinst_PROGRAMS = cartcrf dgraph_wgtf dgraph_unwgtf
-
diff --git a/test/mpi/f77/util/Makefile.am b/test/mpi/f77/util/Makefile.am
index a223378b9..4e5b63383 100644
--- a/test/mpi/f77/util/Makefile.am
+++ b/test/mpi/f77/util/Makefile.am
@@ -11,4 +11,3 @@ EXTRA_LIBRARIES = libmtest_dummy.a
 libmtest_dummy_a_SOURCES = mtestf.f
 
 all-local: mtestf.$(OBJEXT)
-
diff --git a/test/mpi/f90/attr/Makefile.ap b/test/mpi/f90/attr/Makefile.ap
index c61e40858..32b83d044 100644
--- a/test/mpi/f90/attr/Makefile.ap
+++ b/test/mpi/f90/attr/Makefile.ap
@@ -8,5 +8,3 @@ attrlangf90_SOURCES = attrlangf90.f90 attrlangc.c
 # Remove any created module files, if we know the extension of those files
 clean-local:
 	if [ "@FCMODEXT@" != "" ] ; then rm -f *.@FCMODEXT@ ; fi
-
-
diff --git a/test/mpi/f90/datatype/Makefile.ap b/test/mpi/f90/datatype/Makefile.ap
index 9f9466699..dcec9b5ae 100644
--- a/test/mpi/f90/datatype/Makefile.ap
+++ b/test/mpi/f90/datatype/Makefile.ap
@@ -10,4 +10,3 @@ kinds_SOURCES      = kinds.f90
 trf90_SOURCES      = trf90.f90
 get_elem_d_SOURCES = get_elem_d.f90
 get_elem_u_SOURCES = get_elem_u.f90
-
diff --git a/test/mpi/f90/ext/Makefile.ap b/test/mpi/f90/ext/Makefile.ap
index 14417996d..037efba7a 100644
--- a/test/mpi/f90/ext/Makefile.ap
+++ b/test/mpi/f90/ext/Makefile.ap
@@ -8,5 +8,3 @@ c2f902c.c: $(srcdir)/../../f90/ext/c2f902c.c
 	cp $(srcdir)/../../f90/ext/c2f902c.c c2f902c.c
 ctypesfromc.c: $(srcdir)/../../f77/ext/ctypesfromc.c
 	cp $(srcdir)/../../f77/ext/ctypesfromc.c ctypesfromc.c
-
-
diff --git a/test/mpi/f90/f90types/Makefile.am b/test/mpi/f90/f90types/Makefile.am
index bb6768913..73a6e828e 100644
--- a/test/mpi/f90/f90types/Makefile.am
+++ b/test/mpi/f90/f90types/Makefile.am
@@ -13,4 +13,3 @@ EXTRA_DIST = testlist
 
 noinst_PROGRAMS = createf90types
 createf90types_SOURCES = createf90types.c
-
diff --git a/test/mpi/f90/misc/Makefile.am b/test/mpi/f90/misc/Makefile.am
index 600378ff0..44b4f979d 100644
--- a/test/mpi/f90/misc/Makefile.am
+++ b/test/mpi/f90/misc/Makefile.am
@@ -13,4 +13,3 @@ EXTRA_DIST += testlist.ap
 
 noinst_PROGRAMS = sizeof2
 sizeof2_SOURCES = sizeof2.f90
-
diff --git a/test/mpi/f90/timer/Makefile.am b/test/mpi/f90/timer/Makefile.am
index add95bd59..d2a773e9a 100644
--- a/test/mpi/f90/timer/Makefile.am
+++ b/test/mpi/f90/timer/Makefile.am
@@ -11,4 +11,3 @@ EXTRA_DIST = testlist
 
 noinst_PROGRAMS = wtimef90
 wtimef90_SOURCES = wtimef90.f90
-
diff --git a/test/mpi/group/Makefile.am b/test/mpi/group/Makefile.am
index 3db8db31b..3e9ebe9a7 100644
--- a/test/mpi/group/Makefile.am
+++ b/test/mpi/group/Makefile.am
@@ -26,4 +26,3 @@ gtranksperf_LDADD = $(LDADD) -lm
 # glpid is a whitebox test that uses mpiimpl.h; it is unlikely to build with the
 # current build system setup
 #EXTRA_PROGRAMS = glpid
-
diff --git a/test/mpi/maint/testmerge.in b/test/mpi/maint/testmerge.in
index 2034c7a76..35987925b 100644
--- a/test/mpi/maint/testmerge.in
+++ b/test/mpi/maint/testmerge.in
@@ -313,4 +313,3 @@ if ($defnFile eq "" || $tmplFile eq "") {
 }
 
 &ReadAndMerge( $defnFile, $tmplFile );
-
diff --git a/test/mpi/maint/updatefiles b/test/mpi/maint/updatefiles
index a6e24e440..cc3177ff7 100755
--- a/test/mpi/maint/updatefiles
+++ b/test/mpi/maint/updatefiles
@@ -276,4 +276,3 @@ case $finalStatus in
 	exit 1
 	;;
 esac
-
diff --git a/test/mpi/manual/Makefile.am b/test/mpi/manual/Makefile.am
index 94f268742..a870a9d38 100644
--- a/test/mpi/manual/Makefile.am
+++ b/test/mpi/manual/Makefile.am
@@ -21,4 +21,3 @@ testconnectserial_LDADD   = $(LDADD) -lm -lpthread
 singjoin_LDADD = $(LDADD) @socklib@ @nslib@
 
 CLEANFILES += test-port
-
diff --git a/test/mpi/perf/README b/test/mpi/perf/README
index cf5d5d2cb..62662d4f2 100644
--- a/test/mpi/perf/README
+++ b/test/mpi/perf/README
@@ -5,4 +5,3 @@ reported or experienced.  The tests include:
 
 sendrecvl - Send and receive (head to head) large messages.
 mattrans  - Matrix transpose example
-
diff --git a/test/mpi/threads/Makefile_threads.mtest b/test/mpi/threads/Makefile_threads.mtest
index 042b91c6c..228e52a34 100644
--- a/test/mpi/threads/Makefile_threads.mtest
+++ b/test/mpi/threads/Makefile_threads.mtest
@@ -17,4 +17,3 @@ LDADD += $(top_builddir)/threads/util/mtestthread.$(OBJEXT) @threadlib@
 
 $(top_builddir)/threads/util/mtestthread.$(OBJEXT): $(top_srcdir)/threads/util/mtestthread.c
 	(cd $(top_builddir)/threads/util && $(MAKE) mtestthread.$(OBJEXT))
-
diff --git a/test/mpi/threads/coll/Makefile.am b/test/mpi/threads/coll/Makefile.am
index 70549f6d6..df41c6d12 100644
--- a/test/mpi/threads/coll/Makefile.am
+++ b/test/mpi/threads/coll/Makefile.am
@@ -10,4 +10,3 @@ include $(top_srcdir)/threads/Makefile_threads.mtest
 EXTRA_DIST = testlist.in
 
 noinst_PROGRAMS = iallred allred
-
diff --git a/test/mpi/threads/comm/Makefile.am b/test/mpi/threads/comm/Makefile.am
index 1c7f6a20f..503c42dd5 100644
--- a/test/mpi/threads/comm/Makefile.am
+++ b/test/mpi/threads/comm/Makefile.am
@@ -21,4 +21,3 @@ noinst_PROGRAMS =                       \
             ctxidup                     \
             idup_nb                     \
             idup_comm_gen
-
diff --git a/test/mpi/threads/init/Makefile.am b/test/mpi/threads/init/Makefile.am
index 2435aba17..7d0e25f26 100644
--- a/test/mpi/threads/init/Makefile.am
+++ b/test/mpi/threads/init/Makefile.am
@@ -10,4 +10,3 @@ include $(top_srcdir)/threads/Makefile_threads.mtest
 EXTRA_DIST = testlist
 
 noinst_PROGRAMS = initth
-
diff --git a/test/mpi/threads/mpi_t/Makefile.am b/test/mpi/threads/mpi_t/Makefile.am
index 4c840065a..b921d8a53 100644
--- a/test/mpi/threads/mpi_t/Makefile.am
+++ b/test/mpi/threads/mpi_t/Makefile.am
@@ -10,4 +10,3 @@ include $(top_srcdir)/threads/Makefile_threads.mtest
 EXTRA_DIST = testlist
 
 noinst_PROGRAMS = mpit_threading
-
diff --git a/test/mpi/threads/pt2pt/Makefile.am b/test/mpi/threads/pt2pt/Makefile.am
index 70302608f..976572938 100644
--- a/test/mpi/threads/pt2pt/Makefile.am
+++ b/test/mpi/threads/pt2pt/Makefile.am
@@ -11,4 +11,3 @@ EXTRA_DIST = testlist
 
 noinst_PROGRAMS = threads threaded_sr alltoall sendselfth greq_wait greq_test \
                   multisend multisend2 multisend3 multisend4 ibsend
-
diff --git a/test/mpi/threads/spawn/Makefile.am b/test/mpi/threads/spawn/Makefile.am
index 0c999a3d9..ae24608d9 100644
--- a/test/mpi/threads/spawn/Makefile.am
+++ b/test/mpi/threads/spawn/Makefile.am
@@ -10,4 +10,3 @@ include $(top_srcdir)/threads/Makefile_threads.mtest
 EXTRA_DIST = testlist
 
 noinst_PROGRAMS = multispawn th_taskmaster
-
diff --git a/test/mpi/threads/util/Makefile.am b/test/mpi/threads/util/Makefile.am
index cfe17ce38..bddd7ad44 100644
--- a/test/mpi/threads/util/Makefile.am
+++ b/test/mpi/threads/util/Makefile.am
@@ -12,4 +12,3 @@ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 EXTRA_LIBRARIES = libmtestthread_dummy.a
 libmtestthread_dummy_a_SOURCES = mtestthread.c
 all-local: mtestthread.$(OBJEXT)
-
diff --git a/test/mpi/topo/Makefile.am b/test/mpi/topo/Makefile.am
index 51c195ff4..e4c4abd06 100644
--- a/test/mpi/topo/Makefile.am
+++ b/test/mpi/topo/Makefile.am
@@ -30,4 +30,3 @@ noinst_PROGRAMS = \
     graphcr2      \
     distgraph1    \
     dgraph_unwgt
-