Fix copy/paste error (#8937)

[ghc.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 32d243b..e60382b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 # -----------------------------------------------------------------------------
 # generic generated file patterns
 
+Thumbs.db
+.DS_Store
+
 *~
 #*#
 *.bak
@@ -22,6 +25,9 @@
 *.a
 *.o.cmd
 *.depend*
+*.dyn_o
+*.dyn_hi
+
 log
 tags
 
@@ -40,20 +46,15 @@ _darcs/
 # sub-repositories
 
 /ghc-tarballs/
-/libraries/Cabal/
-/libraries/Win32/
+/libffi-tarballs/
 /libraries/array/
 /libraries/base/
-/libraries/binary/
-/libraries/bytestring/
-/libraries/containers/
 /libraries/deepseq/
 /libraries/directory/
 /libraries/dph/
 /libraries/extensible-exceptions/
 /libraries/filepath/
 /libraries/ghc-prim/
-/libraries/haskeline/
 /libraries/haskell2010/
 /libraries/haskell98/
 /libraries/hoopl/
@@ -64,23 +65,36 @@ _darcs/
 /libraries/old-locale/
 /libraries/old-time/
 /libraries/parallel/
-/libraries/pretty/
-/libraries/primitive/
 /libraries/process/
-/libraries/random/
 /libraries/stm/
 /libraries/template-haskell/
-/libraries/terminfo/
 /libraries/unix/
 /libraries/utf8-string/
-/libraries/vector/
-/libraries/xhtml/
 /nofib/
-/testsuite/
-/utils/haddock/
 /utils/hsc2hs/
 
 # -----------------------------------------------------------------------------
+# Cabal dist directories
+
+/driver/ghc/dist/
+/driver/haddock/dist/
+/driver/ghci/dist/
+/driver/split/dist/
+/includes/dist-*/
+/libffi/dist-install/
+/libraries/*/dist-boot/
+/libraries/*/dist-install/
+/libraries/dist-haddock/
+/rts/dist/
+/utils/*/dist*/
+/compiler/stage1/
+/compiler/stage2/
+/compiler/stage3/
+/ghc/stage1/
+/ghc/stage2/
+/ghc/stage3/
+
+# -----------------------------------------------------------------------------
 # specific generated files
 
 /bindist-list
@@ -89,30 +103,8 @@ _darcs/
 /bindisttest/
 /ch01.html
 /ch02.html
-/compiler/cmm/CmmLex.hs
-/compiler/cmm/CmmParse.hs
 /compiler/ghc.cabal
 /compiler/ghc.cabal.old
-/compiler/ghci/LibFFI.hs
-/compiler/ghci/LibFFI_hsc.c
-/compiler/main/Config.hs
-/compiler/main/ParsePkgConf.hs
-/compiler/parser/HaddockLex.hs
-/compiler/parser/HaddockParse.hs
-/compiler/parser/Lexer.hs
-/compiler/parser/Parser.hs
-/compiler/parser/Parser.y
-/compiler/parser/ParserCore.hs
-/compiler/prelude/primops.txt
-/compiler/primop*incl
-/compiler/stage1/
-/compiler/stage2/
-/compiler/stage3/
-/compiler/utils/Fingerprint.hs
-/compiler/utils/Fingerprint_hsc.c
-/distrib/MacOS/GHC-system.pmdoc/index.xml
-/distrib/MacOS/installer-scripts/Uninstaller
-/distrib/MacOS/installer-scripts/create-links
 /distrib/configure.ac
 /distrib/ghc.iss
 /docs/index.html
@@ -122,38 +114,22 @@ _darcs/
 /docs/users_guide/ug-book.xml
 /docs/users_guide/ug-ent.xml
 /docs/users_guide/users_guide.xml
+/docs/users_guide/users_guide.pdf
+/docs/users_guide/users_guide.ps
 /docs/users_guide/users_guide/
 /docs/users_guide/what_glasgow_exts_does.gen.xml
-/driver/ghc/dist/
-/driver/haddock/dist/
 /driver/ghci/ghc-pkg-inplace
 /driver/ghci/ghci-inplace
-/driver/ghci/dist/
 /driver/ghci/ghci.res
-/driver/mangler/dist/ghc-asm
-/driver/mangler/dist/ghc-asm.prl
 /driver/package.conf
 /driver/package.conf.inplace.old
-/driver/split/dist/ghc-split
-/driver/split/dist/ghc-split.prl
-/driver/stamp-pkg-conf-rts
-/extra-gcc-opts
+/settings
 /ghc.spec
 /ghc/ghc-bin.cabal
-/ghc/stage1/
-/ghc/stage2/
-/ghc/stage3/
-/includes/DerivedConstants.h
-/includes/GHCConstants.h
-/includes/dist-*/
 /includes/ghcautoconf.h
 /includes/ghcplatform.h
-/includes/mkDerivedConstantsHdr
-/includes/mkGHCConstants
-/inplace-datadir/
 /index.html
 /inplace/
-/libffi/dist-install/
 /libffi/build/
 /libffi/ffi.h
 /libffi/package.conf.inplace
@@ -176,9 +152,6 @@ _darcs/
 /libraries/plus.gif
 /libraries/synopsis.png
 /libraries/stamp/
-/libraries/time/
-/libraries/*/dist-boot/
-/libraries/*/dist-install/
 /mk/are-validating.mk
 /mk/build.mk
 /mk/config.h
@@ -188,47 +161,17 @@ _darcs/
 /mk/install.mk
 /mk/project.mk
 /mk/project.mk.old
-/mk/stamp-h
 /mk/validate.mk
-/rts/dist/
-/rts/AutoApply.*cmm
 /rts/package.conf.inplace
 /rts/package.conf.inplace.raw
-/rts/sm/Evac_thr.c
-/rts/sm/Scav_thr.c
 /rts/package.conf.install
 /rts/package.conf.install.raw
 /stage3.package.conf
 /testsuite_summary.txt
 /testlog
-/utils/*/dist*/
-/utils/ext-core/Driver
-/utils/ext-core/PrimEnv.hs
-/utils/genapply/genapply
-/utils/genprimopcode/Lexer.hs
-/utils/genprimopcode/Parser.hs
-/utils/genprimopcode/genprimopcode
-/utils/ghc-pkg/Version.hs
-/utils/ghc-pkg/ghc-pkg-inplace
-/utils/ghc-pkg/ghc-pkg-inplace.bin
-/utils/ghc-pkg/ghc-pkg-inplace.hs
-/utils/ghc-pkg/ghc-pkg.bin
-/utils/ghc-pwd/dist-boot/ghc-pwd
-/utils/hasktags/hasktags
-/utils/hasktags/hasktags-inplace
-/utils/hp2ps/hp2ps
-/utils/hpc/HpcParser.hs
-/utils/lndir/lndir
-/utils/mkdependC/mkdependC
-/utils/mkdirhier/mkdirhier
-/utils/prof/cgprof/cgprof
-/utils/prof/ghcprof-inplace
-/utils/pwd/pwd
-/utils/pwd/pwd-inplace
-/utils/runghc/runghc
-/utils/runghc/runghc-inplace
 /utils/runghc/runghc.cabal
-/utils/runghc/runhaskell
-/utils/runstdtest/runstdtest
-/utils/unlit/unlit
 
+/extra-gcc-opts
+
+.tm_properties
+VERSION