Skip to content

Commit

Permalink
Tell vim not to expand tabs in Makefiles.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
zsomogyi committed Jan 8, 2015
1 parent 5700e17 commit d33273d
Show file tree
Hide file tree
Showing 158 changed files with 565 additions and 224 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Mmakefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -775,7 +777,7 @@ uninstall:

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

.PHONY : bindist
.PHONY: bindist
bindist: WORK_IN_PROGRESS TODO
cd bindist; \
PATH="$(INSTALL_PREFIX)/bin:$$PATH" \
Expand Down
4 changes: 4 additions & 0 deletions benchmarks/progs/compress/Mmakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

-include Mmakefile.grade
-include Mmakefile.optlevel
-include Mmakefile.flags
Expand Down
4 changes: 4 additions & 0 deletions benchmarks/progs/icfp2000/Mmakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

-include Mmakefile.grade
-include Mmakefile.optlevel
-include Mmakefile.flags
Expand Down
4 changes: 4 additions & 0 deletions benchmarks/progs/icfp2000_no_iostate/Mmakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

-include Mmakefile.grade
-include Mmakefile.optlevel
-include Mmakefile.flags
Expand Down
4 changes: 4 additions & 0 deletions benchmarks/progs/icfp2000_par/Mmakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

# MCFLAGS =
MCFLAGS = -O6 --intermodule-optimization
CFLAGS = -DML_OMIT_MATH_DOMAIN_CHECKS
Expand Down
6 changes: 4 additions & 2 deletions benchmarks/progs/icfp2000_par/examples/Mmakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------%

GMLS := $(wildcard *.gml)
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions benchmarks/progs/icfp2000_par_pbone/Mmakefile
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

GRADE=asm_fast.gc.par
4 changes: 4 additions & 0 deletions benchmarks/progs/icfp2001/Mmakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

include Mmakefile.grade
include Mmakefile.optlevel
include Mmakefile.flags
Expand Down
6 changes: 5 additions & 1 deletion benchmarks/progs/nuc/Mmakefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

include Mmakefile.grade
include Mmakefile.optlevel
include Mmakefile.flags

PROG_MCFLAGS =
NAME = nuc
PROG = nuc5
ARGS =
ARGS =

include ../Mmakefile.common
4 changes: 4 additions & 0 deletions benchmarks/progs/pic/haskell/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

.PHONY: all
all: pic

Expand Down
4 changes: 4 additions & 0 deletions benchmarks/progs/pic/mercury/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

MC=mmc
MCFLAGS=-O2 --intermodule-optimisation

Expand Down
4 changes: 4 additions & 0 deletions benchmarks/progs/qsort/Mmakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

MCFLAGS =

-include Mmake.params
Expand Down
24 changes: 12 additions & 12 deletions benchmarks/progs/quicksort/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -160,4 +161,3 @@ clean :
asm_fast.gc.threadscope \
asm_fast.par \
asm_fast.par.stseg

4 changes: 4 additions & 0 deletions benchmarks/progs/ray/Mmakefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

include Mmakefile.grade
include Mmakefile.optlevel
include Mmakefile.flags
Expand Down
6 changes: 5 additions & 1 deletion benchmarks/progs/tree234/Mmakefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#-----------------------------------------------------------------------------#
# vim: ts=8 sw=8 noexpandtab
#-----------------------------------------------------------------------------#

include Mmakefile.grade
include Mmakefile.optlevel
include Mmakefile.flags

PROG_MCFLAGS =
NAME = treetest
PROG = treetest
ARGS =
ARGS =

include ../Mmakefile.common
6 changes: 4 additions & 2 deletions bindist/Mmakefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
12 changes: 7 additions & 5 deletions boehm_gc/Mmakefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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) \
Expand Down Expand Up @@ -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

Expand Down
14 changes: 8 additions & 6 deletions browser/Mmakefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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)

#-----------------------------------------------------------------------------#
Expand Down Expand Up @@ -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

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

Expand All @@ -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: \
Expand Down
10 changes: 7 additions & 3 deletions bytecode/Mmakefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -100,7 +102,7 @@ MLFLAGS = --trace

HDRS =

CFILES =
CFILES =

MFILES = simple.m

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

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

.PHONY: all
all: check

Expand All @@ -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)

Expand Down
Loading

0 comments on commit d33273d

Please sign in to comment.