[m-rev.] diff: Remove .cvsignore files

[Paul Bone]

Remove .cvsignore files

Remove old .cvsignore files, moving their contents to .gitignore files.
There are now no .cvsignore files in the repository.

I've also sorted some .gitignore files and avoided repeating a pattern in a
subdirectory's .gitignore file when it is already mentioned in the parent
.gitignore file.
---
 bytecode/.cvsignore                                |  3 --
 bytecode/.gitignore                                |  3 ++
 compiler/notes/.cvsignore                          |  1 -
 compiler/notes/.gitignore                          |  1 +
 extras/.gitignore                                  | 36 ++++++++++++++------
 extras/base64/.cvsignore                           |  4 ---
 extras/cgi/.cvsignore                              | 17 ----------
 extras/complex_numbers/.cvsignore                  | 18 ----------
 extras/dynamic_linking/.cvsignore                  | 18 ----------
 extras/error/.cvsignore                            | 11 ------
 extras/fixed/.cvsignore                            |  4 ---
 extras/graphics/mercury_allegro/.cvsignore         |  4 ---
 .../graphics/mercury_allegro/examples/.cvsignore   |  3 --
 .../mercury_allegro/samples/demo/.cvsignore        |  3 --
 .../mercury_allegro/samples/mandel/.cvsignore      |  3 --
 .../mercury_allegro/samples/pendulum2/.cvsignore   |  3 --
 .../mercury_allegro/samples/speed/.cvsignore       |  3 --
 extras/graphics/mercury_cairo/.cvsignore           |  7 ----
 extras/graphics/mercury_cairo/samples/.cvsignore   | 22 ------------
 extras/graphics/mercury_cairo/tutorial/.cvsignore  | 15 ---------
 extras/graphics/mercury_glut/.cvsignore            | 17 ----------
 extras/graphics/mercury_opengl/.cvsignore          | 21 ------------
 extras/graphics/mercury_opengl/.gitignore          |  5 +++
 extras/graphics/samples/gears/.cvsignore           | 13 --------
 extras/graphics/samples/gears/.gitignore           |  1 +
 extras/graphics/samples/maze/.cvsignore            | 13 --------
 extras/graphics/samples/maze/.gitignore            |  1 +
 extras/lex/.cvsignore                              |  4 ---
 extras/moose/.cvsignore                            | 19 -----------
 extras/posix/.cvsignore                            | 20 -----------
 extras/references/.cvsignore                       |  3 --
 extras/trailed_update/.cvsignore                   | 19 -----------
 extras/trailed_update/samples/.cvsignore           |  2 --
 extras/windows_installer_generator/.cvsignore      | 16 ---------
 extras/xml/.cvsignore                              | 20 -----------
 samples/.cvsignore                                 | 12 -------
 samples/.gitignore                                 | 39 ++++++++++++++++------
 samples/c_interface/c_calls_mercury/.cvsignore     |  5 ---
 samples/c_interface/c_calls_mercury/.gitignore     |  5 +++
 samples/c_interface/mercury_calls_c/.cvsignore     |  1 -
 samples/c_interface/mercury_calls_c/.gitignore     |  1 +
 samples/diff/.cvsignore                            | 13 --------
 samples/diff/.gitignore                            |  1 +
 tests/.gitignore                                   | 13 ++------
 tests/accumulator/.cvsignore                       | 32 ------------------
 tests/accumulator/.gitignore                       | 26 +++++++++++++++
 tests/analysis_ctgc/.cvsignore                     | 22 ------------
 tests/analysis_ctgc/.gitignore                     |  6 ++++
 tests/analysis_excp/.cvsignore                     | 22 ------------
 tests/analysis_excp/.gitignore                     |  6 ++++
 tests/analysis_external/.cvsignore                 | 22 ------------
 tests/analysis_external/.gitignore                 |  6 ++++
 tests/analysis_sharing/.cvsignore                  | 22 ------------
 tests/analysis_sharing/.gitignore                  |  6 ++++
 tests/analysis_table/.cvsignore                    | 22 ------------
 tests/analysis_table/.gitignore                    |  6 ++++
 tests/analysis_trail/.cvsignore                    | 22 ------------
 tests/analysis_trail/.gitignore                    |  6 ++++
 tests/analysis_unused_args/.cvsignore              | 22 ------------
 tests/analysis_unused_args/.gitignore              |  6 ++++
 tests/declarative_debugger/.cvsignore              | 12 -------
 tests/declarative_debugger/.gitignore              |  2 ++
 tests/exceptions/.cvsignore                        |  7 ----
 tests/exceptions/.gitignore                        |  0
 tests/invalid_purity/.cvsignore                    | 22 ------------
 tests/invalid_purity/.gitignore                    |  2 ++
 tests/purity/.cvsignore                            |  7 ----
 tests/purity/.gitignore                            | 30 +++--------------
 tests/string_format/.cvsignore                     |  7 ----
 tests/string_format/.gitignore                     |  0
 tests/structure_reuse/.cvsignore                   |  2 --
 tests/structure_reuse/.gitignore                   |  0
 tests/submodules/.cvsignore                        | 13 --------
 tests/submodules/.gitignore                        |  2 ++
 tests/typeclasses/.cvsignore                       | 32 ------------------
 tests/typeclasses/.gitignore                       | 18 ++++++++++
 76 files changed, 172 insertions(+), 681 deletions(-)
 delete mode 100644 bytecode/.cvsignore
 create mode 100644 bytecode/.gitignore
 delete mode 100644 compiler/notes/.cvsignore
 create mode 100644 compiler/notes/.gitignore
 delete mode 100644 extras/base64/.cvsignore
 delete mode 100644 extras/cgi/.cvsignore
 delete mode 100644 extras/complex_numbers/.cvsignore
 delete mode 100644 extras/dynamic_linking/.cvsignore
 delete mode 100644 extras/error/.cvsignore
 delete mode 100644 extras/fixed/.cvsignore
 delete mode 100644 extras/graphics/mercury_allegro/.cvsignore
 delete mode 100644 extras/graphics/mercury_allegro/examples/.cvsignore
 delete mode 100644 extras/graphics/mercury_allegro/samples/demo/.cvsignore
 delete mode 100644 extras/graphics/mercury_allegro/samples/mandel/.cvsignore
 delete mode 100644 extras/graphics/mercury_allegro/samples/pendulum2/.cvsignore
 delete mode 100644 extras/graphics/mercury_allegro/samples/speed/.cvsignore
 delete mode 100644 extras/graphics/mercury_cairo/.cvsignore
 delete mode 100644 extras/graphics/mercury_cairo/samples/.cvsignore
 delete mode 100644 extras/graphics/mercury_cairo/tutorial/.cvsignore
 delete mode 100644 extras/graphics/mercury_glut/.cvsignore
 delete mode 100644 extras/graphics/mercury_opengl/.cvsignore
 create mode 100644 extras/graphics/mercury_opengl/.gitignore
 delete mode 100644 extras/graphics/samples/gears/.cvsignore
 create mode 100644 extras/graphics/samples/gears/.gitignore
 delete mode 100644 extras/graphics/samples/maze/.cvsignore
 create mode 100644 extras/graphics/samples/maze/.gitignore
 delete mode 100644 extras/lex/.cvsignore
 delete mode 100644 extras/moose/.cvsignore
 delete mode 100644 extras/posix/.cvsignore
 delete mode 100644 extras/references/.cvsignore
 delete mode 100644 extras/trailed_update/.cvsignore
 delete mode 100644 extras/trailed_update/samples/.cvsignore
 delete mode 100644 extras/windows_installer_generator/.cvsignore
 delete mode 100644 extras/xml/.cvsignore
 delete mode 100644 samples/.cvsignore
 delete mode 100644 samples/c_interface/c_calls_mercury/.cvsignore
 create mode 100644 samples/c_interface/c_calls_mercury/.gitignore
 delete mode 100644 samples/c_interface/mercury_calls_c/.cvsignore
 create mode 100644 samples/c_interface/mercury_calls_c/.gitignore
 delete mode 100644 samples/diff/.cvsignore
 create mode 100644 samples/diff/.gitignore
 delete mode 100644 tests/accumulator/.cvsignore
 create mode 100644 tests/accumulator/.gitignore
 delete mode 100644 tests/analysis_ctgc/.cvsignore
 create mode 100644 tests/analysis_ctgc/.gitignore
 delete mode 100644 tests/analysis_excp/.cvsignore
 create mode 100644 tests/analysis_excp/.gitignore
 delete mode 100644 tests/analysis_external/.cvsignore
 create mode 100644 tests/analysis_external/.gitignore
 delete mode 100644 tests/analysis_sharing/.cvsignore
 create mode 100644 tests/analysis_sharing/.gitignore
 delete mode 100644 tests/analysis_table/.cvsignore
 delete mode 100644 tests/analysis_trail/.cvsignore
 delete mode 100644 tests/analysis_unused_args/.cvsignore
 create mode 100644 tests/analysis_unused_args/.gitignore
 delete mode 100644 tests/declarative_debugger/.cvsignore
 delete mode 100644 tests/exceptions/.cvsignore
 create mode 100644 tests/exceptions/.gitignore
 delete mode 100644 tests/invalid_purity/.cvsignore
 create mode 100644 tests/invalid_purity/.gitignore
 delete mode 100644 tests/purity/.cvsignore
 delete mode 100644 tests/string_format/.cvsignore
 create mode 100644 tests/string_format/.gitignore
 delete mode 100644 tests/structure_reuse/.cvsignore
 create mode 100644 tests/structure_reuse/.gitignore
 delete mode 100644 tests/submodules/.cvsignore
 create mode 100644 tests/submodules/.gitignore
 delete mode 100644 tests/typeclasses/.cvsignore
 create mode 100644 tests/typeclasses/.gitignore

diff --git a/bytecode/.cvsignore b/bytecode/.cvsignore
deleted file mode 100644
index 48417cc..0000000
--- a/bytecode/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-mbi
-mdis
-depend.mk
diff --git a/bytecode/.gitignore b/bytecode/.gitignore
new file mode 100644
index 0000000..48417cc
--- /dev/null
+++ b/bytecode/.gitignore
@@ -0,0 +1,3 @@
+mbi
+mdis
+depend.mk
diff --git a/compiler/notes/.cvsignore b/compiler/notes/.cvsignore
deleted file mode 100644
index be6088a..0000000
--- a/compiler/notes/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.text
diff --git a/compiler/notes/.gitignore b/compiler/notes/.gitignore
new file mode 100644
index 0000000..be6088a
--- /dev/null
+++ b/compiler/notes/.gitignore
@@ -0,0 +1 @@
+*.text
diff --git a/extras/.gitignore b/extras/.gitignore
index b33ceea..0cfcab8 100644
--- a/extras/.gitignore
+++ b/extras/.gitignore
@@ -1,15 +1,31 @@
-tags
-Mercury
-Mercury/**
-*.mh
-*.init
-*.err
-*.jar
-*.exe
 *.bat
+*.c
+*.c_date
+*.d
+*.date
+*.date0
+*.date3
+*.dep
 *.dll
+*.dv
+*.err
+*.exe
+*.init
+*.int
+*.int0
+*.int2
+*.int3
+*.jar
 *.lib
+*.mh
+*.mih
+*.o
+*.opt
+*.pic_o
+*.trans_opt
+Mercury
+lib*.a
+lib*.beams
 lib*.dylib
 lib*.so
-lib*.beams
-lib*.a
+tags
diff --git a/extras/base64/.cvsignore b/extras/base64/.cvsignore
deleted file mode 100644
index 4fd7310..0000000
--- a/extras/base64/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Mercury
-*.err
-*.mh
-*.init
diff --git a/extras/cgi/.cvsignore b/extras/cgi/.cvsignore
deleted file mode 100644
index 770ef52..0000000
--- a/extras/cgi/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-Mercury
-*.err
-*.mh
-*.d
-*.c
-*.int
-*.int0
-*.int2
-*.int3
-*.o
-*.pic_o
-*.c_date
-*.date
-*.date3
-*.dep
-*.dv
-*.init
diff --git a/extras/complex_numbers/.cvsignore b/extras/complex_numbers/.cvsignore
deleted file mode 100644
index 652790d..0000000
--- a/extras/complex_numbers/.cvsignore
+++ /dev/null
@@ -1,18 +0,0 @@
-Mercury
-*.err
-*.mh
-*.d
-*.c
-*.int
-*.int0
-*.int2
-*.int3
-*.o
-*.pic_o
-*.c_date
-*.date
-*.date0
-*.date3
-*.dep
-*.dv
-*.init
diff --git a/extras/dynamic_linking/.cvsignore b/extras/dynamic_linking/.cvsignore
deleted file mode 100644
index 3152b99..0000000
--- a/extras/dynamic_linking/.cvsignore
+++ /dev/null
@@ -1,18 +0,0 @@
-dl.m name_mangle.m
-Mercury
-*.err
-*.mh
-*.d
-*.c
-*.int
-*.int0
-*.int2
-*.int3
-*.o
-*.pic_o
-*.c_date
-*.date
-*.date3
-*.dep
-*.dv
-*.init
diff --git a/extras/error/.cvsignore b/extras/error/.cvsignore
deleted file mode 100644
index 8dfd607..0000000
--- a/extras/error/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-error
-*.c
-*.c_date
-*.d
-*.dv
-*.dep
-*.err
-*.mh
-*.mih
-*.opt
-*.trans_opt
diff --git a/extras/fixed/.cvsignore b/extras/fixed/.cvsignore
deleted file mode 100644
index 2465976..0000000
--- a/extras/fixed/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Mercury
-*.err
-*.mh
-mercury_fixed.init
diff --git a/extras/graphics/mercury_allegro/.cvsignore b/extras/graphics/mercury_allegro/.cvsignore
deleted file mode 100644
index dbade37..0000000
--- a/extras/graphics/mercury_allegro/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.err
-*.mh
-LICENCE
-Mercury
diff --git a/extras/graphics/mercury_allegro/examples/.cvsignore b/extras/graphics/mercury_allegro/examples/.cvsignore
deleted file mode 100644
index c5c302a..0000000
--- a/extras/graphics/mercury_allegro/examples/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.err
-*.mh
-Mercury
diff --git a/extras/graphics/mercury_allegro/samples/demo/.cvsignore b/extras/graphics/mercury_allegro/samples/demo/.cvsignore
deleted file mode 100644
index c5c302a..0000000
--- a/extras/graphics/mercury_allegro/samples/demo/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.err
-*.mh
-Mercury
diff --git a/extras/graphics/mercury_allegro/samples/mandel/.cvsignore b/extras/graphics/mercury_allegro/samples/mandel/.cvsignore
deleted file mode 100644
index c5c302a..0000000
--- a/extras/graphics/mercury_allegro/samples/mandel/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.err
-*.mh
-Mercury
diff --git a/extras/graphics/mercury_allegro/samples/pendulum2/.cvsignore b/extras/graphics/mercury_allegro/samples/pendulum2/.cvsignore
deleted file mode 100644
index c5c302a..0000000
--- a/extras/graphics/mercury_allegro/samples/pendulum2/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.err
-*.mh
-Mercury
diff --git a/extras/graphics/mercury_allegro/samples/speed/.cvsignore b/extras/graphics/mercury_allegro/samples/speed/.cvsignore
deleted file mode 100644
index c5c302a..0000000
--- a/extras/graphics/mercury_allegro/samples/speed/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.err
-*.mh
-Mercury
diff --git a/extras/graphics/mercury_cairo/.cvsignore b/extras/graphics/mercury_cairo/.cvsignore
deleted file mode 100644
index 99f2aca..0000000
--- a/extras/graphics/mercury_cairo/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Mercury
-*.mh
-*.err
-*.init
-libmercury_cairo.a
-libmercury_cairo.so
-libmercury_cairo.dylib
diff --git a/extras/graphics/mercury_cairo/samples/.cvsignore b/extras/graphics/mercury_cairo/samples/.cvsignore
deleted file mode 100644
index d00e3f3..0000000
--- a/extras/graphics/mercury_cairo/samples/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-Mercury
-*.err
-*.mh
-*.png
-arc
-arc_negative
-clip
-clip_image
-curve_to
-dash
-fill_and_stroke2
-fill_style
-gradient
-hello
-image
-imagepattern
-multi_segment_caps
-set_line_cap
-set_line_join
-text
-text_align_center
-text_extents
diff --git a/extras/graphics/mercury_cairo/tutorial/.cvsignore b/extras/graphics/mercury_cairo/tutorial/.cvsignore
deleted file mode 100644
index 3ca2b82..0000000
--- a/extras/graphics/mercury_cairo/tutorial/.cvsignore
+++ /dev/null
@@ -1,15 +0,0 @@
-Mercury
-*.err
-*.mh
-*.png
-fill
-mask
-paint
-path_close
-setsourcegradient
-setsourcergba
-showtext
-stroke
-textextents
-tips_ellipse
-tips_letter
diff --git a/extras/graphics/mercury_glut/.cvsignore b/extras/graphics/mercury_glut/.cvsignore
deleted file mode 100644
index 2b61575..0000000
--- a/extras/graphics/mercury_glut/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-*.c
-*.c_date
-*.d
-*.int*
-*.date*
-*.opt
-*.optdate
-*.trans_opt
-*.trans_opt_date
-*.mh
-*.mih
-*.dylib
-*.pic_o
-*.err
-*.dep
-*.dv
-*.init
diff --git a/extras/graphics/mercury_opengl/.cvsignore b/extras/graphics/mercury_opengl/.cvsignore
deleted file mode 100644
index afe9472..0000000
--- a/extras/graphics/mercury_opengl/.cvsignore
+++ /dev/null
@@ -1,21 +0,0 @@
-mogl.c
-mglu.c
-mtogl.c
-mercury_opengl.c
-mogl.type_tables.c
-*.c_date
-*.d
-*.int*
-*.date*
-*.opt
-*.optdate
-*.trans_opt
-*.trans_opt_date
-*.mh
-*.mih
-*.dylib
-*.pic_o
-*.err
-*.dep
-*.dv
-*.init
diff --git a/extras/graphics/mercury_opengl/.gitignore b/extras/graphics/mercury_opengl/.gitignore
new file mode 100644
index 0000000..ccc3b6a
--- /dev/null
+++ b/extras/graphics/mercury_opengl/.gitignore
@@ -0,0 +1,5 @@
+mercury_opengl.c
+mglu.c
+mogl.c
+mogl.type_tables.c
+mtogl.c
diff --git a/extras/graphics/samples/gears/.cvsignore b/extras/graphics/samples/gears/.cvsignore
deleted file mode 100644
index 473cf54..0000000
--- a/extras/graphics/samples/gears/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-gears
-*.c
-*.c_date
-*.d
-*.date
-*.dep
-*.err
-*.mh
-*.mih
-*.o
-*.dv
-*.int
-*.int2
diff --git a/extras/graphics/samples/gears/.gitignore b/extras/graphics/samples/gears/.gitignore
new file mode 100644
index 0000000..86f5225
--- /dev/null
+++ b/extras/graphics/samples/gears/.gitignore
@@ -0,0 +1 @@
+gears
diff --git a/extras/graphics/samples/maze/.cvsignore b/extras/graphics/samples/maze/.cvsignore
deleted file mode 100644
index 14c4a9d..0000000
--- a/extras/graphics/samples/maze/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-maze
-*.c
-*.c_date
-*.d
-*.date
-*.dep
-*.err
-*.mh
-*.mih
-*.o
-*.dv
-*.int
-*.int2
diff --git a/extras/graphics/samples/maze/.gitignore b/extras/graphics/samples/maze/.gitignore
new file mode 100644
index 0000000..844751a
--- /dev/null
+++ b/extras/graphics/samples/maze/.gitignore
@@ -0,0 +1 @@
+maze
diff --git a/extras/lex/.cvsignore b/extras/lex/.cvsignore
deleted file mode 100644
index 4fd7310..0000000
--- a/extras/lex/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Mercury
-*.err
-*.mh
-*.init
diff --git a/extras/moose/.cvsignore b/extras/moose/.cvsignore
deleted file mode 100644
index 56c0dc9..0000000
--- a/extras/moose/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Mercury
-moose
-moose.exe
-*.err
-*.mh
-*.d
-*.c
-*.int
-*.int0
-*.int2
-*.int3
-*.o
-*.pic_o
-*.c_date
-*.date
-*.date3
-*.dep
-*.dv
-*.init
diff --git a/extras/posix/.cvsignore b/extras/posix/.cvsignore
deleted file mode 100644
index c109c30..0000000
--- a/extras/posix/.cvsignore
+++ /dev/null
@@ -1,20 +0,0 @@
-Mercury
-hello
-hello.exe
-*.err
-*.mh
-*.d
-*.c
-*.int
-*.int0
-*.int2
-*.int3
-*.o
-*.pic_o
-*.c_date
-*.date
-*.date0
-*.date3
-*.dep
-*.dv
-*.init
diff --git a/extras/references/.cvsignore b/extras/references/.cvsignore
deleted file mode 100644
index 67de4c8..0000000
--- a/extras/references/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Mercury
-*.err
-*.mh
diff --git a/extras/trailed_update/.cvsignore b/extras/trailed_update/.cvsignore
deleted file mode 100644
index 14b0777..0000000
--- a/extras/trailed_update/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-*.c
-*.c_date
-*.d
-*.date
-*.date3
-*.dep
-*.dv
-*.err
-*.h
-*.init
-*.mh
-*.mih
-*.int
-*.int2
-*.int3
-*.pic_o
-libtrailed_update.a
-libtrailed_update.dylib
-libtrailed_update.so
diff --git a/extras/trailed_update/samples/.cvsignore b/extras/trailed_update/samples/.cvsignore
deleted file mode 100644
index e9873e2..0000000
--- a/extras/trailed_update/samples/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-interpreter.c tests.c vqueens.c
-interpreter tests vqueens
diff --git a/extras/windows_installer_generator/.cvsignore b/extras/windows_installer_generator/.cvsignore
deleted file mode 100644
index 2feb4ac..0000000
--- a/extras/windows_installer_generator/.cvsignore
+++ /dev/null
@@ -1,16 +0,0 @@
-*.dylib
-*.c
-*.c_date
-*.d
-*.date
-*.date3
-*.dep
-*.dv
-*.err
-*.init
-*.int
-*.int2
-*.int3
-*.mh
-*.mih
-*.pic_o
diff --git a/extras/xml/.cvsignore b/extras/xml/.cvsignore
deleted file mode 100644
index 32d9b56..0000000
--- a/extras/xml/.cvsignore
+++ /dev/null
@@ -1,20 +0,0 @@
-Mercury
-tryit
-tryit.exe
-*.err
-*.mh
-*.d
-*.c
-*.int
-*.int0
-*.int2
-*.int3
-*.o
-*.pic_o
-*.c_date
-*.date
-*.date0
-*.date3
-*.dep
-*.dv
-*.init
diff --git a/samples/.cvsignore b/samples/.cvsignore
deleted file mode 100644
index 6e79ff2..0000000
--- a/samples/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.c
-*.c_date
-*.d
-*.dep
-*.dv
-*.err
-*.il
-*.mh
-*.mih
-all_solutions calculator cat committed_choice eliza hello ultra_sub sort
-calculator2 e expand_terms interpreter
-Mercury
diff --git a/samples/.gitignore b/samples/.gitignore
index 08aa600..6b03bfd 100644
--- a/samples/.gitignore
+++ b/samples/.gitignore
@@ -1,23 +1,42 @@
-Mercury
-Mercury/**
-*.mh
-*.init
-*.err
-*.jar
+*.bat
+*.c
+*.c_date
+*.d
+*.date
+*.date0
+*.date3
+*.dep
 *.dll
+*.dv
+*.err
 *.exe
-*.bat
-lib*.dylib
+*.init
+*.int
+*.int0
+*.int2
+*.int3
+*.jar
+*.lib
+*.mh
+*.mih
+*.o
+*.opt
+*.pic_o
+*.trans_opt
+lib*.a
+lib*.beams
 lib*.dll
+lib*.dylib
 lib*.so
-lib*.a
-hello
+Mercury
 calculator
 calculator2
 cat
 e
 eliza
 expand_terms
+hello
 interpreter
 sort
+tags
 ultra_sub
diff --git a/samples/c_interface/c_calls_mercury/.cvsignore b/samples/c_interface/c_calls_mercury/.cvsignore
deleted file mode 100644
index f26e629..0000000
--- a/samples/c_interface/c_calls_mercury/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-c_main_int.c
-mercury_main.c
-mercury_lib.c
-mercury_lib.h
-mercury_main
diff --git a/samples/c_interface/c_calls_mercury/.gitignore b/samples/c_interface/c_calls_mercury/.gitignore
new file mode 100644
index 0000000..f26e629
--- /dev/null
+++ b/samples/c_interface/c_calls_mercury/.gitignore
@@ -0,0 +1,5 @@
+c_main_int.c
+mercury_main.c
+mercury_lib.c
+mercury_lib.h
+mercury_main
diff --git a/samples/c_interface/mercury_calls_c/.cvsignore b/samples/c_interface/mercury_calls_c/.cvsignore
deleted file mode 100644
index e301d81..0000000
--- a/samples/c_interface/mercury_calls_c/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-mercury_main
diff --git a/samples/c_interface/mercury_calls_c/.gitignore b/samples/c_interface/mercury_calls_c/.gitignore
new file mode 100644
index 0000000..e301d81
--- /dev/null
+++ b/samples/c_interface/mercury_calls_c/.gitignore
@@ -0,0 +1 @@
+mercury_main
diff --git a/samples/diff/.cvsignore b/samples/diff/.cvsignore
deleted file mode 100644
index 6cb7fed..0000000
--- a/samples/diff/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.c
-*.c_date
-*.d
-*.date
-*.date3
-*.dep
-*.dv
-*.err
-*.int*
-*.mh
-*.mih
-*.o
-diff
diff --git a/samples/diff/.gitignore b/samples/diff/.gitignore
new file mode 100644
index 0000000..e779424
--- /dev/null
+++ b/samples/diff/.gitignore
@@ -0,0 +1 @@
+diff
diff --git a/tests/.gitignore b/tests/.gitignore
index d385db6..5d6ae9b 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -4,7 +4,6 @@
 *.date
 *.date0
 *.date3
-*.java_date
 *.dep
 *.dep_err
 *.dv
@@ -16,6 +15,7 @@
 *.int0
 *.int2
 *.int3
+*.java_date
 *.log
 *.mh
 *.mih
@@ -23,18 +23,10 @@
 .mgnuc_copts
 .mgnuc_opts
 CLEAN
-FAILED_TESTS
-Mercury
-runtests.errs
-Prof.CallPair
-Prof.Decl
-Prof.MemoryCells
-Prof.MemoryWords
-CLEAN
+DEFNS_FOR_TESTS
 EXPECTED_FAILED_TESTS
 EXPECT_FAIL_TESTS
 FAILED_TC_DIR
-FAILED_TESTS
 FAILED_TESTS_SUMMARY
 FAIL_TESTS
 Mercury
@@ -47,7 +39,6 @@ Prof.MemoryWords
 TESTS_FLAGS
 UNEXPECTED_FAILED_TESTS
 WS_FLAGS
-DEFNS_FOR_TESTS
 jmercury
 mdbrc
 mdbrc.in
diff --git a/tests/accumulator/.cvsignore b/tests/accumulator/.cvsignore
deleted file mode 100644
index fcb562c..0000000
--- a/tests/accumulator/.cvsignore
+++ /dev/null
@@ -1,32 +0,0 @@
-*.res
-*.out
-*.hlds*accum
-*.dv
-*.dep
-*.d
-CLEAN
-dcg
-deconstruct
-chain
-construct
-highorder
-heuristic
-identity
-inter
-nonrec
-out_to_in
-qsort
-simple
-split
-swap
-base
-call_in_base
-disj
-.allres
-INTRODUCED.diff
-.mgnuc_opts
-.mgnuc_copts
-Prof.CallPair
-Prof.Decl
-Prof.MemoryCells
-Prof.MemoryWords
diff --git a/tests/accumulator/.gitignore b/tests/accumulator/.gitignore
new file mode 100644
index 0000000..abc0404
--- /dev/null
+++ b/tests/accumulator/.gitignore
@@ -0,0 +1,26 @@
+*.hlds*accum
+*.out
+*.res
+CLEAN
+INTRODUCED.diff
+Prof.CallPair
+Prof.Decl
+Prof.MemoryCells
+Prof.MemoryWords
+base
+call_in_base
+chain
+construct
+dcg
+deconstruct
+disj
+heuristic
+highorder
+identity
+inter
+nonrec
+out_to_in
+qsort
+simple
+split
+swap
diff --git a/tests/analysis_ctgc/.cvsignore b/tests/analysis_ctgc/.cvsignore
deleted file mode 100644
index 7919a0a..0000000
--- a/tests/analysis_ctgc/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-*.dep
-*.d
-*.date
-*.dv
-*.c *.out *.res
-*.int
-*.int2
-*.err
-*.mh
-*.mih
-*.opt
-*.optdate
-*.res1
-*.gz
-*.c_date
-*.log
-CLEAN
-FAILED_TESTS
-NOMAKE_DIRS
-Mercury.modules
-.mgnuc_opts
-.mgnuc_copts
diff --git a/tests/analysis_ctgc/.gitignore b/tests/analysis_ctgc/.gitignore
new file mode 100644
index 0000000..8d970e5
--- /dev/null
+++ b/tests/analysis_ctgc/.gitignore
@@ -0,0 +1,6 @@
+*.gz
+*.opt
+*.optdate
+*.res1
+FAILED_TESTS
+Mercury.modules
diff --git a/tests/analysis_excp/.cvsignore b/tests/analysis_excp/.cvsignore
deleted file mode 100644
index 7919a0a..0000000
--- a/tests/analysis_excp/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-*.dep
-*.d
-*.date
-*.dv
-*.c *.out *.res
-*.int
-*.int2
-*.err
-*.mh
-*.mih
-*.opt
-*.optdate
-*.res1
-*.gz
-*.c_date
-*.log
-CLEAN
-FAILED_TESTS
-NOMAKE_DIRS
-Mercury.modules
-.mgnuc_opts
-.mgnuc_copts
diff --git a/tests/analysis_excp/.gitignore b/tests/analysis_excp/.gitignore
new file mode 100644
index 0000000..8d970e5
--- /dev/null
+++ b/tests/analysis_excp/.gitignore
@@ -0,0 +1,6 @@
+*.gz
+*.opt
+*.optdate
+*.res1
+FAILED_TESTS
+Mercury.modules
diff --git a/tests/analysis_external/.cvsignore b/tests/analysis_external/.cvsignore
deleted file mode 100644
index 7919a0a..0000000
--- a/tests/analysis_external/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-*.dep
-*.d
-*.date
-*.dv
-*.c *.out *.res
-*.int
-*.int2
-*.err
-*.mh
-*.mih
-*.opt
-*.optdate
-*.res1
-*.gz
-*.c_date
-*.log
-CLEAN
-FAILED_TESTS
-NOMAKE_DIRS
-Mercury.modules
-.mgnuc_opts
-.mgnuc_copts
diff --git a/tests/analysis_external/.gitignore b/tests/analysis_external/.gitignore
new file mode 100644
index 0000000..8d970e5
--- /dev/null
+++ b/tests/analysis_external/.gitignore
@@ -0,0 +1,6 @@
+*.gz
+*.opt
+*.optdate
+*.res1
+FAILED_TESTS
+Mercury.modules
diff --git a/tests/analysis_sharing/.cvsignore b/tests/analysis_sharing/.cvsignore
deleted file mode 100644
index 7919a0a..0000000
--- a/tests/analysis_sharing/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-*.dep
-*.d
-*.date
-*.dv
-*.c *.out *.res
-*.int
-*.int2
-*.err
-*.mh
-*.mih
-*.opt
-*.optdate
-*.res1
-*.gz
-*.c_date
-*.log
-CLEAN
-FAILED_TESTS
-NOMAKE_DIRS
-Mercury.modules
-.mgnuc_opts
-.mgnuc_copts
diff --git a/tests/analysis_sharing/.gitignore b/tests/analysis_sharing/.gitignore
new file mode 100644
index 0000000..8d970e5
--- /dev/null
+++ b/tests/analysis_sharing/.gitignore
@@ -0,0 +1,6 @@
+*.gz
+*.opt
+*.optdate
+*.res1
+FAILED_TESTS
+Mercury.modules
diff --git a/tests/analysis_table/.cvsignore b/tests/analysis_table/.cvsignore
deleted file mode 100644
index 7919a0a..0000000
--- a/tests/analysis_table/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-*.dep
-*.d
-*.date
-*.dv
-*.c *.out *.res
-*.int
-*.int2
-*.err
-*.mh
-*.mih
-*.opt
-*.optdate
-*.res1
-*.gz
-*.c_date
-*.log
-CLEAN
-FAILED_TESTS
-NOMAKE_DIRS
-Mercury.modules
-.mgnuc_opts
-.mgnuc_copts
diff --git a/tests/analysis_table/.gitignore b/tests/analysis_table/.gitignore
index a601d33..ffa18d6 100644
--- a/tests/analysis_table/.gitignore
+++ b/tests/analysis_table/.gitignore
@@ -1 +1,7 @@
+*.gz
+*.opt
+*.optdate
+*.res1
+FAILED_TESTS
+Mercury.modules
 table_m1.m
diff --git a/tests/analysis_trail/.cvsignore b/tests/analysis_trail/.cvsignore
deleted file mode 100644
index 7919a0a..0000000
--- a/tests/analysis_trail/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-*.dep
-*.d
-*.date
-*.dv
-*.c *.out *.res
-*.int
-*.int2
-*.err
-*.mh
-*.mih
-*.opt
-*.optdate
-*.res1
-*.gz
-*.c_date
-*.log
-CLEAN
-FAILED_TESTS
-NOMAKE_DIRS
-Mercury.modules
-.mgnuc_opts
-.mgnuc_copts
diff --git a/tests/analysis_trail/.gitignore b/tests/analysis_trail/.gitignore
index e80b9ee..65bc817 100644
--- a/tests/analysis_trail/.gitignore
+++ b/tests/analysis_trail/.gitignore
@@ -1 +1,7 @@
+*.gz
+*.opt
+*.optdate
+*.res1
+FAILED_TESTS
+Mercury.modules
 trail_m1.m
diff --git a/tests/analysis_unused_args/.cvsignore b/tests/analysis_unused_args/.cvsignore
deleted file mode 100644
index 7919a0a..0000000
--- a/tests/analysis_unused_args/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-*.dep
-*.d
-*.date
-*.dv
-*.c *.out *.res
-*.int
-*.int2
-*.err
-*.mh
-*.mih
-*.opt
-*.optdate
-*.res1
-*.gz
-*.c_date
-*.log
-CLEAN
-FAILED_TESTS
-NOMAKE_DIRS
-Mercury.modules
-.mgnuc_opts
-.mgnuc_copts
diff --git a/tests/analysis_unused_args/.gitignore b/tests/analysis_unused_args/.gitignore
new file mode 100644
index 0000000..8d970e5
--- /dev/null
+++ b/tests/analysis_unused_args/.gitignore
@@ -0,0 +1,6 @@
+*.gz
+*.opt
+*.optdate
+*.res1
+FAILED_TESTS
+Mercury.modules
diff --git a/tests/declarative_debugger/.cvsignore b/tests/declarative_debugger/.cvsignore
deleted file mode 100644
index 1fec227..0000000
--- a/tests/declarative_debugger/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.dep
-*.d
-*.out
-*.res
-CLEAN
-dice.pass
-.mgnuc_copts
-.mgnuc_opts
-Prof.CallPair
-Prof.Decl
-Prof.MemoryCells
-Prof.MemoryWords
diff --git a/tests/declarative_debugger/.gitignore b/tests/declarative_debugger/.gitignore
index f68f218..4935b5c 100644
--- a/tests/declarative_debugger/.gitignore
+++ b/tests/declarative_debugger/.gitignore
@@ -1 +1,3 @@
+*.out
+*.res
 dice.pass
diff --git a/tests/exceptions/.cvsignore b/tests/exceptions/.cvsignore
deleted file mode 100644
index 1e69adb..0000000
--- a/tests/exceptions/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-CLEAN
-.mgnuc_copts
-.mgnuc_opts
-Prof.CallPair
-Prof.Decl
-Prof.MemoryCells
-Prof.MemoryWords
diff --git a/tests/exceptions/.gitignore b/tests/exceptions/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/tests/invalid_purity/.cvsignore b/tests/invalid_purity/.cvsignore
deleted file mode 100644
index 550d5c2..0000000
--- a/tests/invalid_purity/.cvsignore
+++ /dev/null
@@ -1,22 +0,0 @@
-*.d
-*.date
-*.date0
-*.date3
-*.dep
-*.err_res*
-*.int
-*.int0
-*.int2
-*.int3
-*.dv
-*.c
-.allres
-CLEAN
-FAILED_TESTS
-runtests.errs
-.mgnuc_copts
-.mgnuc_opts
-Prof.CallPair
-Prof.Decl
-Prof.MemoryCells
-Prof.MemoryWords
diff --git a/tests/invalid_purity/.gitignore b/tests/invalid_purity/.gitignore
new file mode 100644
index 0000000..4e688fe
--- /dev/null
+++ b/tests/invalid_purity/.gitignore
@@ -0,0 +1,2 @@
+*.err_res*
+FAILED_TESTS
diff --git a/tests/purity/.cvsignore b/tests/purity/.cvsignore
deleted file mode 100644
index 1e69adb..0000000
--- a/tests/purity/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-CLEAN
-.mgnuc_copts
-.mgnuc_opts
-Prof.CallPair
-Prof.Decl
-Prof.MemoryCells
-Prof.MemoryWords
diff --git a/tests/purity/.gitignore b/tests/purity/.gitignore
index 8b763be..70537ea 100644
--- a/tests/purity/.gitignore
+++ b/tests/purity/.gitignore
@@ -1,23 +1,13 @@
-*.dep
-*.d
-*.date
-*.dv
-*.c
+*.gz
 *.o
 *.obj
-*.out
-*.res
-*.int
-*.int2
-*.err
-*.mh
-*.mih
 *.opt
 *.optdate
+*.out
+*.res
 *.res1
-*.gz
-*.c_date
-*.log
+FAILED_TESTS
+Mercury.modules
 impure_func_t1
 impure_func_t5_fixed2
 impure_func_t6
@@ -25,13 +15,3 @@ impure_pred_t1_fixed3
 promise_pure_test
 purity
 purity_opt
-runtests.errs
-.mgnuc_copts
-.mgnuc_opts
-FAILED_TESTS
-NOMAKE_DIRS
-Mercury.modules
-Prof.CallPair
-Prof.Decl
-Prof.MemoryCells
-Prof.MemoryWords
diff --git a/tests/string_format/.cvsignore b/tests/string_format/.cvsignore
deleted file mode 100644
index 1e69adb..0000000
--- a/tests/string_format/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-CLEAN
-.mgnuc_copts
-.mgnuc_opts
-Prof.CallPair
-Prof.Decl
-Prof.MemoryCells
-Prof.MemoryWords
diff --git a/tests/string_format/.gitignore b/tests/string_format/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/tests/structure_reuse/.cvsignore b/tests/structure_reuse/.cvsignore
deleted file mode 100644
index 70ae0ce..0000000
--- a/tests/structure_reuse/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.mgnuc_copts
-.mgnuc_opts
diff --git a/tests/structure_reuse/.gitignore b/tests/structure_reuse/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/tests/submodules/.cvsignore b/tests/submodules/.cvsignore
deleted file mode 100644
index 6d3de43..0000000
--- a/tests/submodules/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.dep
-*.d
-*.err
-*.int0
-*.out
-*.res
-CLEAN
-.mgnuc_copts
-.mgnuc_opts
-Prof.CallPair
-Prof.Decl
-Prof.MemoryCells
-Prof.MemoryWords
diff --git a/tests/submodules/.gitignore b/tests/submodules/.gitignore
new file mode 100644
index 0000000..b4679e9
--- /dev/null
+++ b/tests/submodules/.gitignore
@@ -0,0 +1,2 @@
+*.out
+*.res
diff --git a/tests/typeclasses/.cvsignore b/tests/typeclasses/.cvsignore
deleted file mode 100644
index 9d8ed3d..0000000
--- a/tests/typeclasses/.cvsignore
+++ /dev/null
@@ -1,32 +0,0 @@
-*.dep
-*.d
-*.dv
-*.err
-*.log
-*.mh
-*.res
-*.out
-CLEAN
-constrained_lambda
-extract_typeinfo
-ho_map
-implied_instance
-implied_instance_missing_constraint
-implied_instance_poly
-multi_constraint_diff_tvar
-multi_constraint_same_tvar
-multi_parameter
-nondet_class_method
-operator_classname
-superclass_call
-test_default_func_mode
-typeclass_test_5
-typeclass_test_6
-FAILED_TESTS
-.mgnuc_copts
-.mgnuc_opts
-runtests.errs
-Prof.CallPair
-Prof.Decl
-Prof.MemoryCells
-Prof.MemoryWords
diff --git a/tests/typeclasses/.gitignore b/tests/typeclasses/.gitignore
new file mode 100644
index 0000000..f8220ed
--- /dev/null
+++ b/tests/typeclasses/.gitignore
@@ -0,0 +1,18 @@
+*.out
+*.res
+FAILED_TESTS
+constrained_lambda
+extract_typeinfo
+ho_map
+implied_instance
+implied_instance_missing_constraint
+implied_instance_poly
+multi_constraint_diff_tvar
+multi_constraint_same_tvar
+multi_parameter
+nondet_class_method
+operator_classname
+superclass_call
+test_default_func_mode
+typeclass_test_5
+typeclass_test_6
-- 
2.7.4