Tell vim not to expand tabs in Makefiles.

This file-specific setting will override a default setting of expandtabs in $HOME/.vimrc. */Makefile: */Mmakefile: As above. tests/hard_coded/.gitignore: Don't ignore the purity subdir. This ignore must have been left over from when purity.m was a test in hard_coded, not hard_coded/purity, and it ignored an executable, not a directory.
2026-04-15 01:13:30 +00:00 · 2015-01-08 22:07:29 +11:00
parent 5700e17e7a
commit d33273d033
158 changed files with 565 additions and 224 deletions
--- a/5
+++ b/5
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1995-1998, 2000, 2002, 2004-2005, 2010, 2012 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public Licence - see the file COPYING in the Mercury distribution.
@@ -15,9 +17,8 @@
 #
 #-----------------------------------------------------------------------------#

-
 SHELL=		/bin/sh
-MMAKE=		MMAKE_DIR=`pwd`/scripts scripts/mmake 
+MMAKE=		MMAKE_DIR=`pwd`/scripts scripts/mmake
 MMAKE_SUBDIR=	MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL)

 # PARALLEL=-j2
--- a/4
+++ b/4
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1995-2012 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public Licence - see the file COPYING in the Mercury distribution.
@@ -775,7 +777,7 @@ uninstall:

 #-----------------------------------------------------------------------------#

-.PHONY : bindist
+.PHONY: bindist
 bindist: WORK_IN_PROGRESS TODO
 	cd bindist; \
 		PATH="$(INSTALL_PREFIX)/bin:$$PATH" \
--- a/benchmarks/progs/compress/Mmakefile
+++ b/benchmarks/progs/compress/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 -include Mmakefile.grade
 -include Mmakefile.optlevel
 -include Mmakefile.flags
--- a/benchmarks/progs/icfp2000/Mmakefile
+++ b/benchmarks/progs/icfp2000/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 -include Mmakefile.grade
 -include Mmakefile.optlevel
 -include Mmakefile.flags
--- a/benchmarks/progs/icfp2000_no_iostate/Mmakefile
+++ b/benchmarks/progs/icfp2000_no_iostate/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 -include Mmakefile.grade
 -include Mmakefile.optlevel
 -include Mmakefile.flags
--- a/benchmarks/progs/icfp2000_par/Mmakefile
+++ b/benchmarks/progs/icfp2000_par/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 # MCFLAGS =
 MCFLAGS = -O6 --intermodule-optimization
 CFLAGS = -DML_OMIT_MATH_DOMAIN_CHECKS
--- a/benchmarks/progs/icfp2000_par/examples/Mmakefile
+++ b/benchmarks/progs/icfp2000_par/examples/Mmakefile
@@ -1,3 +1,5 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------%

 GMLS := $(wildcard *.gml)
@@ -8,9 +10,9 @@ XVS = $(GMLS:.gml=.xv)

 #-----------------------------------------------------------------------------%

-main_target : $(PPMS)
+main_target: $(PPMS)

-xv : $(XVS)
+xv: $(XVS)

 %.ppm: %.gml ../main
 	time cpp -P $< | ../main
--- a/benchmarks/progs/icfp2000_par_pbone/Mmakefile
+++ b/benchmarks/progs/icfp2000_par_pbone/Mmakefile
@@ -1 +1,5 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 GRADE=asm_fast.gc.par
--- a/benchmarks/progs/icfp2001/Mmakefile
+++ b/benchmarks/progs/icfp2001/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 include Mmakefile.grade
 include Mmakefile.optlevel
 include Mmakefile.flags
--- a/benchmarks/progs/nuc/Mmakefile
+++ b/benchmarks/progs/nuc/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 include Mmakefile.grade
 include Mmakefile.optlevel
 include Mmakefile.flags
@@ -5,6 +9,6 @@ include Mmakefile.flags
 PROG_MCFLAGS =
 NAME = nuc
 PROG = nuc5
-ARGS = 
+ARGS =

 include ../Mmakefile.common
--- a/benchmarks/progs/pic/haskell/Makefile
+++ b/benchmarks/progs/pic/haskell/Makefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 .PHONY:	all
 all:	pic

--- a/benchmarks/progs/pic/mercury/Makefile
+++ b/benchmarks/progs/pic/mercury/Makefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 MC=mmc
 MCFLAGS=-O2 --intermodule-optimisation

--- a/benchmarks/progs/qsort/Mmakefile
+++ b/benchmarks/progs/qsort/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 MCFLAGS =

 -include Mmake.params
--- a/benchmarks/progs/quicksort/Makefile
+++ b/benchmarks/progs/quicksort/Makefile
@@ -1,4 +1,6 @@
-# vim: ts=8 sw=8 noet
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#

 MCFLAGS=--runtime-flags "--heap-size $$((1*1024*1024))"
 MC=mmc
@@ -129,25 +131,24 @@ asm_fast.gc.par.stseg.threadscope:
 asm_fast.par.threadscope:
 	mkdir asm_fast.par.threadscope

-
-%_8.m : $(subst _8,,$@)
+%_8.m: $(subst _8,,$@)
 	sed -e 's/THRESHOLD/8/' < $(subst _8,,$@) > $@
-%_7.m : $(subst _7,,$@)
+%_7.m: $(subst _7,,$@)
 	sed -e 's/THRESHOLD/7/' < $(subst _7,,$@) > $@
-%_6.m : $(subst _6,,$@)
+%_6.m: $(subst _6,,$@)
 	sed -e 's/THRESHOLD/6/' < $(subst _6,,$@) > $@
-%_5.m : $(subst _5,,$@)
+%_5.m: $(subst _5,,$@)
 	sed -e 's/THRESHOLD/5/' < $(subst _5,,$@) > $@
-%_4.m : $(subst _4,,$@)
+%_4.m: $(subst _4,,$@)
 	sed -e 's/THRESHOLD/4/' < $(subst _4,,$@) > $@
-%_3.m : $(subst _3,,$@)
+%_3.m: $(subst _3,,$@)
 	sed -e 's/THRESHOLD/3/' < $(subst _3,,$@) > $@
-%_2.m : $(subst _2,,$@)
+%_2.m: $(subst _2,,$@)
 	sed -e 's/THRESHOLD/2/' < $(subst _2,,$@) > $@
-%_1.m : $(subst _1,,$@)
+%_1.m: $(subst _1,,$@)
 	sed -e 's/THRESHOLD/1/' < $(subst _1,,$@) > $@

-clean :
+clean:
 	rm -rf $(TARGETS) Mercury \
 	asm_fast \
 	asm_fast.ctgc \
@@ -160,4 +161,3 @@ clean :
 	asm_fast.gc.threadscope \
 	asm_fast.par \
 	asm_fast.par.stseg
-
--- a/benchmarks/progs/ray/Mmakefile
+++ b/benchmarks/progs/ray/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 include Mmakefile.grade
 include Mmakefile.optlevel
 include Mmakefile.flags
--- a/benchmarks/progs/tree234/Mmakefile
+++ b/benchmarks/progs/tree234/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 include Mmakefile.grade
 include Mmakefile.optlevel
 include Mmakefile.flags
@@ -5,6 +9,6 @@ include Mmakefile.flags
 PROG_MCFLAGS =
 NAME = treetest
 PROG = treetest
-ARGS = 
+ARGS =

 include ../Mmakefile.common
--- a/bindist/Mmakefile
+++ b/bindist/Mmakefile
@@ -1,8 +1,10 @@
-#---------------------------------------------------------------------------#
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1996-2003, 2005-2006, 2008, 2010 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public License - see the file COPYING in the Mercury distribution.
-#---------------------------------------------------------------------------#
+#-----------------------------------------------------------------------------#

 # This Mmake file is used to build a binary distribution.
 # You need to have already installed the Mercury compiler.
--- a/boehm_gc/Mmakefile
+++ b/boehm_gc/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1995-2004, 2006-2007, 2010, 2012 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public Licence - see the file COPYING in the Mercury distribution.
@@ -46,7 +48,7 @@ MMAKEFLAGS=

 #	We need to export MAKEFLAGS="" to avoid passing the `-r' (suppress
 #	builtin rules) supplied by Mmake to the boehm_gc Makefile, which
-#	needs the builtin rules. 
+#	needs the builtin rules.
 #	We don't use `unset', since the Ultrix /bin/sh doesn't have `unset'.
 #
 #	We also need to explicitly pass `-j1' after MMAKEFLAGS,
@@ -89,9 +91,9 @@ clean_local:
 	rm -f libatomic_ops/src/config.h
 	rm -f libatomic_ops/src/atomic_ops/sysdeps/Makefile
 	rm -rf libatomic_ops-install
-else 
+else

-submake: Makefile force 
+submake: Makefile force
 	MAKEFLAGS=""; export MAKEFLAGS; \
 	PATH=../util:$$PATH $(MAKE) $(MMAKEFLAGS) -j1 \
 		GRADE=$(GRADE) GC_GRADE=$(GC_GRADE) \
@@ -167,8 +169,8 @@ PRIVATE_HEADERS= \

 ifeq ($(USE_DLLS),yes)

-LIBGC_DLL_H = libgc_dll.h 
-LIBGC_GLOBALS_H = libgc_globals.h 
+LIBGC_DLL_H = libgc_dll.h
+LIBGC_GLOBALS_H = libgc_globals.h

 else

--- a/browser/Mmakefile
+++ b/browser/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1998-2007, 2009-2010, 2012 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public License - see the file COPYING in the Mercury distribution.
@@ -82,7 +84,7 @@ MCFLAGS      += --flags MDB_FLAGS $(CONFIG_OVERRIDE)
 # in the .dep files, so it must be passed here, however if a C source
 # distribution is generated on a Darwin system then by default the
 # -install_name option will be passed in the .dep files which will cause it to
-# be passed twice (here and in the .dep files) which is not allowed by the 
+# be passed twice (here and in the .dep files) which is not allowed by the
 # linker, so we disable the mmc option which causes the -install_name option
 # to be passed in the .dep files.

@@ -177,13 +179,13 @@ Mercury.modules: MDB_FLAGS
 .PHONY: check
 check:	$(CHECKS)

-.PHONY: all-ints 
+.PHONY: all-ints
 all-ints: ints int3s

-.PHONY: ints 
+.PHONY: ints
 ints:	$(INTS_TARGETS)

-.PHONY: int3s 
+.PHONY: int3s
 int3s:	$(INT3S_TARGETS)

 #-----------------------------------------------------------------------------#
@@ -232,7 +234,7 @@ endif
 # Ensure we recompile mdb__version if VERSION is changed.
 $(os_subdir)mdb.o \
 $(os_subdir)mdb.pic_o \
-        : $(RUNTIME_DIR)/mercury_conf.h
+	: $(RUNTIME_DIR)/mercury_conf.h

 #-----------------------------------------------------------------------------#

@@ -259,7 +261,7 @@ ifeq ($(MMAKE_USE_MMC_MAKE),yes)
 .PHONY: install_library
 install_library: lib$(BROWSER_LIB_NAME).install

-else 
+else

 .PHONY: install_library
 install_library:				\
--- a/bytecode/Mmakefile
+++ b/bytecode/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1998-2002, 2005 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public License - see the file COPYING in the Mercury distribution.
@@ -84,7 +86,7 @@ MERCURY_INC	= \
 		 -I$(BOEHM_GC_DIR) \
 		 -I$(BOEHM_GC_DIR)/include \
 		 -I$(TRACE_DIR)
-	
+
 #-----------------------------------------------------------------------------#

 CFLAGS		= $(MERCURY_INC) -DMR_BYTECODE_CALLABLE -g
@@ -100,7 +102,7 @@ MLFLAGS		= --trace

 HDRS		=

-CFILES		= 
+CFILES		=

 MFILES		= simple.m

@@ -117,6 +119,7 @@ ALL_OBJS	= $(OBJS) $(MB_OBJS)
 ALL_DEPENDS=$(ALL_MFILES:%=%.depend)

 #-----------------------------------------------------------------------------#
+
 .PHONY: all
 all: check

@@ -126,8 +129,9 @@ MLOBJS		= $(MB_OBJS)
 check: simple

 #-----------------------------------------------------------------------------#
+
 # tags actually depends on $(MERCURY_SYSTEM) too but since changes to that
-# hardly ever have an effect, just ignore them
+# hardly ever have an effect, just ignore them.
 tags: $(ALL_CFILES) $(ALL_HDRS) tags2
 	ctags $(CTAGFLAGS) $(ALL_CFILES) $(ALL_HDRS) $(MERCURY_SYSTEM)

--- a/compiler/Mmakefile
+++ b/compiler/Mmakefile
@@ -1,10 +1,12 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1995-2003, 2005-2012 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public Licence - see the file COPYING in the Mercury distribution.
 #-----------------------------------------------------------------------------#

-# Mmake - this is Mmake file for building the Mercury compiler 
+# Mmake - this is Mmake file for building the Mercury compiler

 MERCURY_DIR=..
 LINK_STATIC=yes
@@ -101,7 +103,7 @@ MC_PROG = top_level
 .PHONY: depend
 depend:		$(MC_PROG).depend

-$(MC_PROG).depend: Mercury.modules COMP_FLAGS 
+$(MC_PROG).depend: Mercury.modules COMP_FLAGS

 # This directory contains source files for which the module
 # name doesn't match the file name, so smart recompilation
@@ -131,7 +133,7 @@ mercury_compile$(EXT_FOR_EXE): $(MC_PROG)$(EXT_FOR_EXE)
 	rm -f mercury_compile$(EXT_FOR_EXE)
 	$(LN) $(MC_PROG)$(EXT_FOR_EXE) mercury_compile$(EXT_FOR_EXE) || \
 		cp $(MC_PROG)$(EXT_FOR_EXE) mercury_compile$(EXT_FOR_EXE)
-ifeq ($(findstring il,$(GRADE)),il)        
+ifeq ($(findstring il,$(GRADE)),il)
 	# set the stack size to 100M -- the default of 1M is too low
 	-editbin /nologo /stack:100000000 mercury_compile$(EXT_FOR_EXE)
 	cp ../browser/*.dll .
@@ -150,7 +152,7 @@ endif
 # Add some additional dependencies, so that Mmake knows to remake the
 # compiler if one of the libraries changes.

-ifeq ($(findstring il,$(GRADE)),il)        
+ifeq ($(findstring il,$(GRADE)),il)
 CSCFLAGS=/lib

 # This line works around an Mmake bug: mmake doesn't record
@@ -175,10 +177,10 @@ endif
 .PHONY: check
 check:	$(MC_PROG).check

-.PHONY: ints 
+.PHONY: ints
 int3s:	$(MC_PROG).int3s

-.PHONY: ints 
+.PHONY: ints
 ints:	$(MC_PROG).ints

 #-----------------------------------------------------------------------------#
@@ -254,7 +256,7 @@ install_all: install_mercury

 .PHONY: install_mercury
 install_mercury: install_compiler
-	
+
 .PHONY: install_dirs
 install_dirs:
 	-[ -d $(INSTALL_MERC_BIN_DIR) ] || mkdir -p $(INSTALL_MERC_BIN_DIR)
--- a/compiler/notes/Mmakefile
+++ b/compiler/notes/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1996-1997, 1999, 2001, 2003 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public License - see the file COPYING in the Mercury distribution.
--- a/deep_profiler/Mmakefile
+++ b/deep_profiler/Mmakefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------#
-# vim: noet
+# vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 1995-2012 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
@@ -45,7 +45,7 @@ ALL_DEEP_MODULES = \
 	mdprof_procrep

 # Always compile the deep profiler, even if it is not enabled.
-# 
+#
 MAIN_TARGET=all
 MERCURY_MAIN_MODULES=$(ALL_DEEP_MODULES)
 DEPEND=$(patsubst %,%.depend,$(ALL_DEEP_MODULES))
@@ -141,7 +141,7 @@ $(MDBCOMP_MODULES): .mdbcomp_modules
 # (ignored) failure of an action.
 #
 # We could modify the action here to copy only the changed files.
-.mdbcomp_modules : $(MDBCOMP_ORIG_MODULES)
+.mdbcomp_modules: $(MDBCOMP_ORIG_MODULES)
 	-@chmod a+w $(MDBCOMP_MODULES) > /dev/null 2>&1; exit 0
 	cp $(MDBCOMP_ORIG_MODULES) .
 	@chmod a-w $(MDBCOMP_MODULES)
@@ -181,7 +181,7 @@ $(cs_subdir)mdprof_procrep_init.c:		$(UTIL_DIR)/mkinit$(EXT_FOR_EXE)
 .PHONY: check
 check:	DEPEND=$(patsubst %,%.check,$(ALL_DEEP_MODULES))

-.PHONY: ints 
+.PHONY: ints
 ints:	DEPEND=$(patsubst %,%.ints,$(ALL_DEEP_MODULES))

 #-----------------------------------------------------------------------------#
--- a/doc/Mmakefile
+++ b/doc/Mmakefile
@@ -1,4 +1,5 @@
-# vim: ts=8 sw=8 noet
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 1996-2007, 2009-2012 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
@@ -276,7 +277,7 @@ library-chapters.texi_pp: ../VERSION $(LIBRARY_DIR)/*.m

 library.dvi_log library_toc.html library_1.html mercury_library.info \
 		mercury_library.html mercury_library/index.html \
-		library.dvi : \
+		library.dvi: \
 	library-menu.texi_pp library-chapters.texi_pp

 #-----------------------------------------------------------------------------#
@@ -295,9 +296,8 @@ doc.ps.tar.gz: ps

 #-----------------------------------------------------------------------------#

-	# Currently `mmake all' does not build the PostScript or plain-text
-	# versions of the documentation.  If they are added they should
-	# be installed here.
+# Currently `mmake all' does not build the PostScript or plain-text versions
+# of the documentation. If they are added they should be installed here.
 .PHONY: install
 install: install_info install_html install_dvi install_manpages \
 	install_mdb_doc
--- a/extras/Mmakefile
+++ b/extras/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2002-2003, 2005, 2007, 2011 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/base64/Makefile
+++ b/extras/base64/Makefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/base64/Mmakefile
+++ b/extras/base64/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/cgi/Mmakefile
+++ b/extras/cgi/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2002-2004 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/complex_numbers/Mmakefile
+++ b/extras/complex_numbers/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2002-2003 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/complex_numbers/samples/Mmakefile
+++ b/extras/complex_numbers/samples/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+#
 # COMPLEX_NUMBERS_DIR specifies the location of the complex number library,
 # e.g. `/foo/bar/mercury-<version>/extra/complex_numbers'.
 COMPLEX_NUMBERS_DIR = ..
@@ -10,4 +14,4 @@ MLLIBS = -lcomplex_numbers
 C2INITARGS = $(COMPLEX_NUMBERS_DIR)/complex_numbers.init

 MAIN_TARGET = fft
-depend : fft.depend
+depend: fft.depend
--- a/extras/complex_numbers/tests/Mmakefile
+++ b/extras/complex_numbers/tests/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+#
 # COMPLEX_NUMBERS_DIR specifies the location of the complex number library,
 # e.g. `/foo/bar/mercury-<version>/extra/complex_numbers'.
 COMPLEX_NUMBERS_DIR = ..
@@ -18,4 +22,3 @@ complex_test.out: complex_test

 complex_test.res: complex_test.out complex_test.exp
 	diff -c complex_test.out complex_test.exp > complex_test.res
-
--- a/extras/curs/Mmakefile
+++ b/extras/curs/Mmakefile
@@ -1,11 +1,13 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+#
 # Copyright (C) 2001 Ralph Becket <rbeck@microsoft.com>
 #
 #   THIS FILE IS HEREBY CONTRIBUTED TO THE MERCURY PROJECT TO
 #   BE RELEASED UNDER WHATEVER LICENCE IS DEEMED APPROPRIATE
 #   BY THE ADMINISTRATORS OF THE MERCURY PROJECT.

-
-
 # To build, do the following:
 #
 # $ mmake depend
--- a/extras/curs/samples/Mmakefile
+++ b/extras/curs/samples/Mmakefile
@@ -1,10 +1,13 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+#
 # Copyright (C) 2001 Ralph Becket <rbeck@microsoft.com>
 #
 #   THIS FILE IS HEREBY CONTRIBUTED TO THE MERCURY PROJECT TO
 #   BE RELEASED UNDER WHATEVER LICENCE IS DEEMED APPROPRIATE
 #   BY THE ADMINISTRATORS OF THE MERCURY PROJECT.

-
 # Specify the location of the `mypackage' and `myotherlib' directories
 #
 CURS_DIR = ..
--- a/extras/curses/Mmakefile
+++ b/extras/curses/Mmakefile
@@ -1,16 +1,18 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2000-2003 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
 #-----------------------------------------------------------------------------#

 # This is needed to avoid conflicts with `bool'
-CFLAGS = -DMERCURY_BOOTSTRAP_H	
+CFLAGS = -DMERCURY_BOOTSTRAP_H

 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras

 # The following definition is correct for Linux.  You may need to change
-# this line to include the appropriate curses library for your OS. 
+# this line to include the appropriate curses library for your OS.
 MLLIBS = -lncurses

 -include ../Mmake.params
--- a/extras/curses/sample/Mmakefile
+++ b/extras/curses/sample/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 # Specify location of the mcurses library
 MCURSES_DIR = ..

--- a/extras/dynamic_linking/Mmakefile
+++ b/extras/dynamic_linking/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2000-2005 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/error/Mmakefile
+++ b/extras/error/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2003, 2008 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/fixed/Makefile
+++ b/extras/fixed/Makefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
@@ -8,7 +10,6 @@

 TARGET=mercury_fixed

-
 .PHONY: build
 build:
 	mmc --make lib$(TARGET)
--- a/extras/fixed/Mmakefile
+++ b/extras/fixed/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/graphics/mercury_allegro/Makefile
+++ b/extras/graphics/mercury_allegro/Makefile
@@ -1,4 +1,7 @@
-# 
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+#
 # We don't assume that AllegroGL is installed so the default target doesn't
 # build AllegroGL (or AllegroGL samples, if there were any).
 # Run `make agl' for that.
@@ -41,8 +44,8 @@ realclean:
 	$(MMC_MAKE) mercury_allegro.realclean 2> /dev/null
 	$(MMC_MAKE) mercury_allegrogl.realclean 2> /dev/null
 	# XXX mmc --make --use-grade-subdirs doesn't yet remove .init files
-	$(RM) mercury_allegro.init 
-	$(RM) mercury_allegrogl.init 
+	$(RM) mercury_allegro.init
+	$(RM) mercury_allegrogl.init
 	#
 	(cd examples ; $(MMC_MAKE) exdata.realclean 2> /dev/null )
 	(cd examples ; $(MMC_MAKE) exhello.realclean 2> /dev/null )
--- a/extras/graphics/mercury_cairo/samples/Makefile
+++ b/extras/graphics/mercury_cairo/samples/Makefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 include ../Cairo.options

 MMC=mmc
--- a/extras/graphics/mercury_cairo/tutorial/Makefile
+++ b/extras/graphics/mercury_cairo/tutorial/Makefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 include ../Cairo.options

 MMC=mmc
--- a/extras/graphics/mercury_glut/Mmakefile
+++ b/extras/graphics/mercury_glut/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+#
 # To build the GLUT binding, do the following:
 #
 # $ mmake depend
@@ -11,7 +15,7 @@
 MAIN_TARGET = libmercury_glut

 # The following libraries are for X on Linux (Debian) using Mesa.
-	
+
 # Libaries required by X windows.
 X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib

--- a/extras/graphics/mercury_opengl/Mmakefile
+++ b/extras/graphics/mercury_opengl/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1997, 2003-2007 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/graphics/mercury_tcltk/Mmakefile
+++ b/extras/graphics/mercury_tcltk/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1998, 2001, 2003, 2005 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
@@ -13,8 +15,8 @@ MLLIBS    = -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11 -lXmu -lXext -lm -ldl \

 MLFLAGS	  = -R/usr/X11R6/lib

-# On some Linux machines you may need to let mgnuc know where the 
-# tcl/tk header files are. 
+# On some Linux machines you may need to let mgnuc know where the
+# tcl/tk header files are.
 # EXTRA_CFLAGS = -I/usr/include/tcl8.0

 LIBRARY = libmercury_tcltk
--- a/extras/graphics/samples/calc/Mmakefile
+++ b/extras/graphics/samples/calc/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 # Specify the location of the `mercury_tcltk' package.
 MERCURY_TCLTK_DIR	= ../../mercury_tcltk

@@ -5,7 +9,7 @@ MERCURY_TCLTK_DIR	= ../../mercury_tcltk
 MGNUCFLAGS    = --pic-reg -I$(MERCURY_TCLTK_DIR) -I/usr/include/tcl8.4
 EXTRA_MLFLAGS = -shared

-# This will need to be modified according to the versions of 
+# This will need to be modified according to the versions of
 # tk and tcl you are using.
 EXTRA_MLLIBS  = -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11 \
 			-lXext -lm -ldl
@@ -14,11 +18,10 @@ EXTRA_MLLIBS  = -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11 \
 VPATH 		= $(MERCURY_TCLTK_DIR):$(MMAKE_VPATH)
 MCFLAGS 	= -I$(MERCURY_TCLTK_DIR) $(EXTRA_MCFLAGS)
 MLFLAGS 	= -R$(MERCURY_TCLTK_DIR) $(EXTRA_MLFLAGS) \
-          	  -L$(MERCURY_TCLTK_DIR) 
+          	  -L$(MERCURY_TCLTK_DIR)
 MLLIBS 		= -lmercury_tcltk $(EXTRA_MLLIBS)
-C2INITARGS 	= $(MERCURY_TCLTK_DIR)/mercury_tcltk.init 
+C2INITARGS 	= $(MERCURY_TCLTK_DIR)/mercury_tcltk.init

-default_target : calc
-
-depend : calc.dep
+default_target: calc

+depend: calc.dep
--- a/extras/graphics/samples/gears/Mmakefile
+++ b/extras/graphics/samples/gears/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 MAIN_TARGET = gears

 # Specify the location of the `mercury_opengl' and `mercury_glut'
@@ -16,7 +20,7 @@ VPATH = $(MERCURY_OPENGL_DIR):$(MERCURY_GLUT_DIR):$(MMAKE_VPATH)
 MCFLAGS = -I$(MERCURY_OPENGL_DIR) -I$(MERCURY_GLUT_DIR) \
 	$(EXTRA_MCFLAGS)
 MLFLAGS = -R$(MERCURY_OPENGL_DIR) -R$(MERCURY_GLUT_DIR) \
-	-L$(MERCURY_OPENGL_DIR) -L$(MERCURY_GLUT_DIR) $(EXTRA_MLFLAGS) 
+	-L$(MERCURY_OPENGL_DIR) -L$(MERCURY_GLUT_DIR) $(EXTRA_MLFLAGS)

 MLLIBS += -lmercury_opengl -lmercury_glut $(EXTRA_MLLIBS)

--- a/extras/graphics/samples/maze/Mmakefile
+++ b/extras/graphics/samples/maze/Mmakefile
@@ -1,5 +1,8 @@
-MAIN_TARGET = maze 
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#

+MAIN_TARGET = maze

 # Specify the location of the `mercury_opengl' and `mercury_glut'
 # packages.
@@ -17,7 +20,7 @@ VPATH = $(MERCURY_OPENGL_DIR):$(MERCURY_GLUT_DIR):$(MMAKE_VPATH)
 MCFLAGS = -I$(MERCURY_OPENGL_DIR) -I$(MERCURY_GLUT_DIR) \
 	$(EXTRA_MCFLAGS)
 MLFLAGS = -R$(MERCURY_OPENGL_DIR) -R$(MERCURY_GLUT_DIR) \
-	-L$(MERCURY_OPENGL_DIR) -L$(MERCURY_GLUT_DIR) $(EXTRA_MLFLAGS) 
+	-L$(MERCURY_OPENGL_DIR) -L$(MERCURY_GLUT_DIR) $(EXTRA_MLFLAGS)

 MLLIBS += -lmercury_opengl -lmercury_glut $(EXTRA_MLLIBS)

--- a/extras/graphics/samples/pent/Mmakefile
+++ b/extras/graphics/samples/pent/Mmakefile
@@ -1,3 +1,6 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#

 # To use shared libraries under Linux you need this.
 #MGNUCFLAGS    = --pic-reg
@@ -8,7 +11,7 @@ TCLTK_VERSION = 8.0
 EXTRA_MLLIBS = -ltk$(TCLTK_VERSION) -ltcl$(TCLTK_VERSION) -lGLU -lGL \
 		-L/usr/X11R6/lib -lX11 -lXmu -lXext -ldl -lSM -lXi -lXt

-# Specify the location of the `mercury_tcltk' `mtogl' and 
+# Specify the location of the `mercury_tcltk' `mtogl' and
 # `mercury_opengl' packages.
 MERCURY_TCLTK_DIR   = ../../mercury_tcltk
 MERCURY_OPENGL_DIR  = ../../mercury_opengl
@@ -31,7 +34,6 @@ C2INITARGS      = $(MERCURY_TCLTK_DIR)/mercury_tcltk.init \
 	# the .mh files are.
 MGNUCFLAGS = -I../../mercury_tcltk

-default_target : pent
-
-depend : pent.depend
+default_target: pent

+depend: pent.depend
--- a/extras/lex/Makefile
+++ b/extras/lex/Makefile
@@ -1,3 +1,6 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2001 Ralph Becket <rbeck@microsoft.com>
 # Copyright (C) 2002-2007, 2011 The University of Melbourne

--- a/extras/lex/Mmakefile
+++ b/extras/lex/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/lex/samples/Makefile
+++ b/extras/lex/samples/Makefile
@@ -1,3 +1,6 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2001-2007 The University of Melbourne
 # Ralph Becket <rafe@cs.mu.oz.au>
 #
@@ -25,4 +28,3 @@ all: lex_demo regex_demo

 %: %.m
 	mmc --make --mld $(EXTRA_LIB_DIR) $(EXTRA_LIBRARIES_FLAGS) $@
-
--- a/extras/lex/tests/Makefile
+++ b/extras/lex/tests/Makefile
@@ -1,3 +1,6 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2002-2007 The University of Melbourne
 # Ralph Becket <rafe@cs.mu.oz.au>
 #
@@ -27,4 +30,3 @@ all: test_regex
 check: test_regex
 	./test_regex < test_regex.in > test_regex.res
 	diff -u test_regex.exp test_regex.res && echo "Passed" || echo "Failed"
-
--- a/extras/logged_output/Mmakefile
+++ b/extras/logged_output/Mmakefile
@@ -1,3 +1,5 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
 #----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2003 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
--- a/extras/monte/Mmakefile
+++ b/extras/monte/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2010 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/moose/Mmakefile
+++ b/extras/moose/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2002-2003 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/moose/samples/Mmakefile
+++ b/extras/moose/samples/Mmakefile
@@ -1,9 +1,12 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#

 .SUFFIXES: .m .moo

-default_target : all
+default_target: all

-depend : try_alpha.depend try_expr.depend
+depend: try_alpha.depend try_expr.depend

 try_alpha.depend: alpha.m
 try_expr.depend: expr.m
@@ -14,5 +17,4 @@ all: try_alpha try_expr cgram.m small.m
 	../moose $<

 realclean:
-	rm -f alpha.m expr.m small.m cgram.m 
-
+	rm -f alpha.m expr.m small.m cgram.m
--- a/extras/moose/tests/Mmakefile
+++ b/extras/moose/tests/Mmakefile
@@ -1,9 +1,12 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#

 .SUFFIXES: .m .moo

-default_target : all
+default_target: all

-depend : array_based.depend
+depend: array_based.depend

 array_based.depend: array_based.m

@@ -14,4 +17,3 @@ all: array_based.c

 realclean:
 	rm -f array_based.m
-
--- a/extras/morphine/non-regression-tests/Mmakefile
+++ b/extras/morphine/non-regression-tests/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#

 main_target:	check

@@ -23,7 +25,7 @@ MLFLAGS = --trace
 # The following is necessary for shared libraries to work on Linux.
 MGNUCFLAGS-queens =--pic-reg
 MGNUCFLAGS-queens_init =--pic-reg
-MLFLAGS-queens = --shared 
+MLFLAGS-queens = --shared

 # Base grades `jump' and `fast' cannot be used with
 # stack layouts (which are required for tracing).
@@ -44,10 +46,10 @@ endif

 #-----------------------------------------------------------------------------#

-queens.out.orig: queens queens.in 
+queens.out.orig: queens queens.in
 	$(MORPHINE) < queens.in > queens.out.orig 2>&1

-# Filter out things that might change depending if we use Eclipse3.5.2 
+# Filter out things that might change depending if we use Eclipse3.5.2
 # or Eclipse4.*, unix or inet socket, etc.
 queens.out: queens.out.orig
 	cat queens.out.orig | \
--- a/extras/net/Makefile
+++ b/extras/net/Makefile
@@ -1,4 +1,5 @@
-# vim: noet ts=4 sw=4
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2014 The Mercury Team
 # This file may only be copied under the terms of the GNU Library General
@@ -9,21 +10,19 @@ MMC=mmc
 MTAGS=mtags
 MCFLAGS=-O3 --intermodule-optimization --use-grade-subdirs --grade hlc.gc

-
 MERCURY_FILES=$(wildcard *.m)

-all : libnet.so echo
+all: libnet.so echo

-libnet.so : $(MERCURY_FILES)
+libnet.so: $(MERCURY_FILES)
 	$(MMC) $(MCFLAGS) --make libnet

-echo : $(MERCURY_FILES)
+echo: $(MERCURY_FILES)
 	$(MMC) $(MCFLAGS) --make echo

-tags : $(MERCURY_FILES)
+tags: $(MERCURY_FILES)
 	$(MTAGS) $(MERCURY_FILES)

-.PHONY : clean
-clean :
+.PHONY: clean
+clean:
 	rm -rf Mercury *.mh *.err echo libnet.so libnet.a net.init tags
-
--- a/extras/odbc/Mmakefile
+++ b/extras/odbc/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1997-2000, 2003, 2006 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public License - see the file COPYING in the Mercury distribution.
@@ -34,7 +36,7 @@ INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
 ifeq ($(MODBC_DRIVER),MODBC_MS)
 	ODBC_INCL_DIR=$(ODBC_SDK_DIR)/include
 	MLLIBS=-lodbc32
-else 
+else
 	#ODBC_LIB_DIR=$(IODBC_DIR)/lib
 	#ODBC_INCL_DIR=$(IODBC_DIR)/include

--- a/extras/posix/Mmakefile
+++ b/extras/posix/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2002-2004 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
@@ -15,7 +17,7 @@ MGNUCFLAGS = --no-ansi
 # This library has some parts that are implemented in C
 # rather than in Mercury.  The following lines ensure that
 # the .h and .o files for those parts get included in the library.
-ADDITIONAL_HDRS = posix_workarounds.h 
+ADDITIONAL_HDRS = posix_workarounds.h
 MLOBJS = posix_workarounds.$O
 MLPICOBJS = posix_workarounds.$(EXT_FOR_PIC_OBJECTS)

--- a/extras/posix/samples/Mmakefile
+++ b/extras/posix/samples/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2007 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/quickcheck/Mmakefile
+++ b/extras/quickcheck/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2001, 2003 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
@@ -23,4 +25,3 @@ install: libqcheck.install
 check:  test_qcheck
 	./test_qcheck
 	@echo "All tests passed"
-
--- a/extras/references/Makefile
+++ b/extras/references/Makefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/references/Mmakefile
+++ b/extras/references/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/references/samples/Mmakefile
+++ b/extras/references/samples/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1997-1999, 2011 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
@@ -27,7 +29,7 @@ RESS	=	$(PROGS:%=%.res)

 #-----------------------------------------------------------------------------#

-$(PROGS): 
+$(PROGS):

 %.out: %
 	./$< > $@ 2>&1;
--- a/extras/references/tests/Mmakefile
+++ b/extras/references/tests/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1997-2000, 2003-2004, 2011 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/solver_types/library/Mmakefile
+++ b/extras/solver_types/library/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2005-2006 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/trailed_update/Mmakefile
+++ b/extras/trailed_update/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1997-1998, 2000, 2004, 2010 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/trailed_update/samples/Mmakefile
+++ b/extras/trailed_update/samples/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1997-2002, 2007, 2010 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/extras/trailed_update/tests/Mmakefile
+++ b/extras/trailed_update/tests/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1997-2002, 2006-2007, 2010 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
@@ -32,7 +34,7 @@ C2INITARGS = ../trailed_update.init

 #-----------------------------------------------------------------------------#

-PROGS	=	var_test 
+PROGS	=	var_test
 DEPENDS =	$(PROGS:%=%.depend)
 CS	=	$(PROGS:%=%.c)
 RESS	=	$(PROGS:%=%.res)
--- a/extras/windows_installer_generator/Mmakefile
+++ b/extras/windows_installer_generator/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 MAIN_TARGET=libwix
 depend: wix.depend
 install: libwix.install
--- a/extras/windows_installer_generator/sample/Mmakefile
+++ b/extras/windows_installer_generator/sample/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 MAIN_TARGET=gen_merc_wxs
 depend: gen_merc_wxs.depend

--- a/extras/xml/Mmakefile
+++ b/extras/xml/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2002 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
 # Public License - see the file COPYING.LIB in the Mercury distribution.
--- a/java/runtime/Mmakefile
+++ b/java/runtime/Mmakefile
@@ -1,3 +1,6 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#

 # Copyright (C) 2004 The University of Melbourne.
 # This file may only be copied under the terms of the GNU Library General
@@ -18,7 +21,7 @@ NATIVE_SO	= Native.$(EXT_FOR_SHARED_LIB)
 MAIN_TARGET	= $(NATIVE_SO)

 PIC_OBJS	= $(RUNTIME_DIR)/mercury_timing.$(EXT_FOR_PIC_OBJECTS) \
-		  $(NATIVE_PIC)
+		$(NATIVE_PIC)

 CFLAGS		= -I$(RUNTIME_DIR)

--- a/mdbcomp/Mmakefile
+++ b/mdbcomp/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2005-2007, 2009-2010, 2012 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public License - see the file COPYING in the Mercury distribution.
@@ -71,7 +73,7 @@ endif
 # in the .dep files, so it must be passed here, however if a C source
 # distribution is generated on a Darwin system then by default the
 # -install_name option will be passed in the .dep files which will cause it to
-# be passed twice (here and in the .dep files) which is not allowed by the 
+# be passed twice (here and in the .dep files) which is not allowed by the
 # linker, so we disable the mmc option which causes the -install_name option
 # to be passed in the .dep files.

@@ -143,13 +145,13 @@ Mercury.modules: MDBCOMP_FLAGS
 .PHONY: check
 check:	$(CHECKS)

-.PHONY: all-ints 
+.PHONY: all-ints
 all-ints: ints int3s

-.PHONY: ints 
+.PHONY: ints
 ints:	$(INTS_TARGETS)

-.PHONY: int3s 
+.PHONY: int3s
 int3s:	$(INT3S_TARGETS)

 #-----------------------------------------------------------------------------#
--- a/mfilterjavac/Mmakefile
+++ b/mfilterjavac/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 2013 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public Licence - see the file COPYING in the Mercury distribution.
@@ -83,7 +85,7 @@ $(cs_subdir)mfilterjavac.c:			$(UTIL_DIR)/mkinit$(EXT_FOR_EXE)
 .PHONY: check
 check:	DEPEND=$(patsubst %,%.check,$(ALL_MODULES))

-.PHONY: ints 
+.PHONY: ints
 ints:	DEPEND=$(patsubst %,%.ints,$(ALL_MODULES))

 #-----------------------------------------------------------------------------#
@@ -115,7 +117,7 @@ tags_file_exists:

 .PHONY: dates
 dates:
-	touch 	$(mfilterjavac.dates)
+	touch $(mfilterjavac.dates)

 #-----------------------------------------------------------------------------#

--- a/profiler/Mmakefile
+++ b/profiler/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # Copyright (C) 1995-2000, 2002-2003, 2005, 2007, 2009-2010, 2012 The University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public Licence - see the file COPYING in the Mercury distribution.
@@ -65,7 +67,7 @@ endif
 .PHONY: check
 check:	mercury_profile.check

-.PHONY: ints 
+.PHONY: ints
 ints:	mercury_profile.ints

 #-----------------------------------------------------------------------------#
--- a/robdd/Makefile
+++ b/robdd/Makefile
@@ -1,5 +1,7 @@
 #-----------------------------------------------------------------------------#
-# Copyright (C) 2001-2004,2007 University of Melbourne. 
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+# Copyright (C) 2001-2004,2007 University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public Licence - see the file COPYING in the Mercury distribution.
 #-----------------------------------------------------------------------------#
--- a/robdd/Mmakefile
+++ b/robdd/Mmakefile
@@ -1,5 +1,7 @@
 #-----------------------------------------------------------------------------#
-# Copyright (C) 2003-2004, 2006 University of Melbourne. 
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+# Copyright (C) 2003-2004, 2006 University of Melbourne.
 # This file may only be copied under the terms of the GNU General
 # Public Licence - see the file COPYING in the Mercury distribution.
 #-----------------------------------------------------------------------------#
@@ -11,7 +13,6 @@ MAIN_TARGET=robdd
 MERCURY_DIR=..
 include $(MERCURY_DIR)/Mmake.common

-
 MGNUC		= $(SCRIPTS_DIR)/mgnuc --no-mercury-stdlib-dir

 EXTRA_CFLAGS	= -I$(BROWSER_DIR) -I$(LIBRARY_DIR) -I$(RUNTIME_DIR) \
--- a/runtime/Mmakefile
+++ b/runtime/Mmakefile
@@ -1,3 +1,4 @@
+#-----------------------------------------------------------------------------#
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 1998-2011 The University of Melbourne.
@@ -16,8 +17,8 @@ MAIN_TARGET=all
 # All the headers in $(HDRS) must also be in C (not C++).

 # Note that $(LIB_GLOBALS_H) cannot be part of $(HDRS), since it depends on
-# lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A, and $(OBJ) : $(HDRS) would create a
-# circular dependency.  For similar but different reasons,
+# lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A, and $(OBJ): $(HDRS) would create a
+# circular dependency. For similar but different reasons,
 # $(LIB_DLL_H) also cannot be part of $(HDRS).

 #		  keep this list in alphabetical order, please
@@ -515,7 +516,7 @@ install_headers: $(HDRS) $(BODY_HDRS) $(MACHHDRS) \
 install_init: $(RT_LIB_NAME).init install_dirs
 	cp `vpath_find $(RT_LIB_NAME).init` $(INSTALL_GRADE_MODULE_DIR)

-.PHONY: install_lib 
+.PHONY: install_lib
 install_lib: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
 		install_dirs install_init
 	cp `vpath_find lib$(RT_LIB_NAME).$A \
@@ -528,7 +529,7 @@ endif

 #-----------------------------------------------------------------------------#

-mercury_dotnet.cs : mercury_dotnet.cs.in
+mercury_dotnet.cs: mercury_dotnet.cs.in
 	CONFIG_FILES=$@ CONFIG_HEADERS= $(MERCURY_DIR)/config.status
 	# check to ensure there were no misspelt autoconf variable names
 	if grep -n '[^$$]@.*@' $@; then false; else true; fi
--- a/samples/Mmakefile
+++ b/samples/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.  -fjh (the author).
 #-----------------------------------------------------------------------------#

--- a/samples/appengine/Makefile
+++ b/samples/appengine/Makefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 MMC_DIR=$(shell dirname `which mmc`)
 MMC_JARS_DIR=$(MMC_DIR)/../lib/mercury/lib/java
 WEBINF=war/WEB-INF
--- a/samples/c_interface/c_calls_mercury/Mmakefile
+++ b/samples/c_interface/c_calls_mercury/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.  -fjh (the author).
 #-----------------------------------------------------------------------------#
 MAIN_TARGET=all
--- a/samples/c_interface/cplusplus_calls_mercury/Mmakefile
+++ b/samples/c_interface/cplusplus_calls_mercury/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.  -fjh (the author).
 #-----------------------------------------------------------------------------#
 MAIN_TARGET=all
--- a/samples/c_interface/mercury_calls_c/Mmakefile
+++ b/samples/c_interface/mercury_calls_c/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.  -fjh (the author).
 #-----------------------------------------------------------------------------#

--- a/samples/c_interface/mercury_calls_cplusplus/Mmakefile
+++ b/samples/c_interface/mercury_calls_cplusplus/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.  -fjh (the author).
 #-----------------------------------------------------------------------------#

--- a/samples/c_interface/mercury_calls_fortran/Mmakefile
+++ b/samples/c_interface/mercury_calls_fortran/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.  -fjh (the author).
 #-----------------------------------------------------------------------------#

--- a/samples/c_interface/simpler_c_calls_mercury/Mmakefile
+++ b/samples/c_interface/simpler_c_calls_mercury/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.  -fjh (the author).
 #-----------------------------------------------------------------------------#

--- a/samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile
+++ b/samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.  -fjh (the author).
 #-----------------------------------------------------------------------------#

--- a/samples/c_interface/standalone_c/Makefile
+++ b/samples/c_interface/standalone_c/Makefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+#
 # This directory contains an example of how to create and use a stand-alone
 # interface.  Stand-alone interfaces allow exported Mercury procedures to be
 # called from "foreign" applications, that is applications whose entry point
@@ -57,7 +61,7 @@ MERCURY_LIB_LDFLAGS = libmercury_lib.a

 # For using shared libraries.  (Remember to comment out the versions
 # above if you use these.)
-# 
+#
 #MERCURY_LINKAGE = --mercury-linkage shared
 #MERCURY_LIB_LDFLAGS = -L. -Wl,-rpath . -lmercury_lib

@@ -76,8 +80,8 @@ CC = $(shell $(MMC) --output-cc)
 #
 # Note that the output of the `--output-cflags' option also includes any other
 # flags that the Mercury compiler passes to the C compiler, for example options
-# that control optimisation settings. 
-# 
+# that control optimisation settings.
+#
 # We use a finer grained approach here that only queries the Mercury compiler
 # about which macros to define for the current grade and what directories to
 # search for header files in.  This finer grained approach is useful if a
@@ -105,8 +109,8 @@ CFLAGS = $(CFLAGS_FOR_GRADE) $(CFLAGS_FOR_INCLUDES)
 #
 LD = $(shell $(MMC) --output-link-command)

-# Ask the Mercury compiler what flags it passes to the linker in order to link against
-# the selected set of Mercury libraries?
+# Ask the Mercury compiler what flags it passes to the linker in order to
+# link against the selected set of Mercury libraries?
 #
 LIB_LDFLAGS = $(shell $(MMC) $(GRADEOPT) $(MERCURY_LINKAGE) --output-library-link-flags)

--- a/samples/diff/Mmakefile
+++ b/samples/diff/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 # An example of a *short* Mmake file
 # In fact you don't really need any Mmake file at all,
 # just `mmake diff.depend; mmake diff' is enough.
--- a/samples/java_interface/java_calls_mercury/Makefile
+++ b/samples/java_interface/java_calls_mercury/Makefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.
 #-----------------------------------------------------------------------------#

--- a/samples/java_interface/mercury_calls_java/Makefile
+++ b/samples/java_interface/mercury_calls_java/Makefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.
 #-----------------------------------------------------------------------------#

--- a/samples/java_interface/standalone_java/Makefile
+++ b/samples/java_interface/standalone_java/Makefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.
 #-----------------------------------------------------------------------------#

--- a/samples/muz/Mmakefile
+++ b/samples/muz/Mmakefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 MAIN_TARGET=muz

 depend: muz.depend
--- a/samples/rot13/Mmakefile
+++ b/samples/rot13/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
 # This source file is hereby placed in the public domain.  -trd (the author).
 #-----------------------------------------------------------------------------#

--- a/samples/solver_types/Makefile
+++ b/samples/solver_types/Makefile
@@ -1,3 +1,7 @@
+#-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#
+
 .PHONY: all

 all: sudoku test_eqneq
--- a/samples/tests/Mmakefile
+++ b/samples/tests/Mmakefile
@@ -1,4 +1,6 @@
 #-----------------------------------------------------------------------------#
+# vim: ts=8 sw=8 noexpandtab
+#-----------------------------------------------------------------------------#

 main_target: check

--- a/Show More
+++ b/Show More