Restore the --coerce option in 'happy' configuration
[ghc.git] / .gitignore
index 245b2a5..27709cb 100644 (file)
@@ -35,6 +35,7 @@ __pycache__
 
 log
 tags
+TAGS
 
 autom4te.cache
 config.log
@@ -49,7 +50,7 @@ stage0
 stage1
 stage2
 _build
-hadrian
+.hadrian_ghci
 
 # -----------------------------------------------------------------------------
 # Ignore any overlapped darcs repos and back up files
@@ -68,7 +69,6 @@ _darcs/
 /driver/ghc/dist/
 /driver/haddock/dist/
 /driver/ghci/dist/
-/driver/split/dist/
 /includes/dist-*/
 /libffi/dist-install/
 /libraries/*/dist-boot/
@@ -82,13 +82,13 @@ _darcs/
 /ghc/stage1/
 /ghc/stage2/
 /ghc/stage3/
-/iserv/stage2*/
-/iserv/dist/
+/utils/iserv/stage2*/
 
 # -----------------------------------------------------------------------------
 # specific generated files
 
 /bindist-list
+/bindist-list.uniq
 /bindistprep/
 /bindisttest/HelloWorld
 /bindisttest/
@@ -113,6 +113,8 @@ _darcs/
 /docs/users_guide/build-man
 /docs/users_guide/.doctrees-*
 /docs/users_guide/.doctrees/
+/docs/users_guide/ghc_packages.pyc
+/docs/users_guide/utils.pyc
 /driver/ghci/ghc-pkg-inplace
 /driver/ghci/ghci-inplace
 /driver/ghci/ghci.res
@@ -121,6 +123,7 @@ _darcs/
 /settings
 /ghc.spec
 /ghc/ghc-bin.cabal
+/includes/dist/
 /includes/ghcautoconf.h
 /includes/ghcplatform.h
 /includes/ghcversion.h
@@ -143,6 +146,7 @@ _darcs/
 /libraries/ghc-boot-th/GNUmakefile
 /libraries/ghc-boot-th/ghc-boot-th.cabal
 /libraries/ghc-boot-th/ghc.mk
+/libraries/ghc-heap/ghc-heap.cabal
 /libraries/ghci/GNUmakefile
 /libraries/ghci/ghci.cabal
 /libraries/ghci/ghc.mk
@@ -150,11 +154,13 @@ _darcs/
 /libraries/hslogo-16.png
 /libraries/index-frames.html
 /libraries/index.html
+/libraries/libiserv/libiserv.cabal
 /libraries/minus.gif
 /libraries/ocean.css
 /libraries/plus.gif
 /libraries/synopsis.png
 /libraries/stamp/
+/libraries/template-haskell/template-haskell.cabal
 /linter.log
 /mk/are-validating.mk
 /mk/build.mk
@@ -166,6 +172,7 @@ _darcs/
 /mk/project.mk
 /mk/project.mk.old
 /mk/validate.mk
+/rts/rts.cabal
 /rts/package.conf.inplace
 /rts/package.conf.inplace.raw
 /rts/package.conf.install
@@ -174,9 +181,18 @@ _darcs/
 /testsuite_summary*.txt
 /testsuite*.xml
 /testlog*
+/utils/iserv/iserv.cabal
+/utils/iserv-proxy/iserv-proxy.cabal
+/utils/remote-iserv/remote-iserv.cabal
 /utils/mkUserGuidePart/mkUserGuidePart.cabal
 /utils/runghc/runghc.cabal
 /utils/gen-dll/gen-dll.cabal
+utils/lndir/fs.*
+utils/unlit/fs.*
+rts/fs.*
+libraries/base/include/fs.h
+libraries/base/cbits/fs.c
+missing-win32-tarballs
 
 /extra-gcc-opts
 /sdistprep
@@ -195,3 +211,15 @@ GIT_COMMIT_ID
 
 # Should be equal to testdir_suffix from testsuite/driver/testlib.py.
 *.run
+
+# -----------------------------------------------------------------------------
+# Output of ghc-in-ghci
+
+/.ghci-objects/
+
+# -----------------------------------------------------------------------------
+# ghc.nix
+ghc.nix/
+
+
+.gdb_history