diff options
author | David Waern <david.waern@gmail.com> | 2007-11-11 02:09:41 +0000 |
---|---|---|
committer | David Waern <david.waern@gmail.com> | 2007-11-11 02:09:41 +0000 |
commit | a37df6aa14d02396f80704683f8e1a1fd59ce2b1 (patch) | |
tree | 0189d4edd65cf1d2681ccc0234e3ce57bb7e9932 /haddock.cabal | |
parent | 76dac89e5a2360f1fecd52d4d7083196903f7307 (diff) |
Fix conflicts
Diffstat (limited to 'haddock.cabal')
-rw-r--r-- | haddock.cabal | 101 |
1 files changed, 63 insertions, 38 deletions
diff --git a/haddock.cabal b/haddock.cabal index c4202436..92f8057f 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -1,21 +1,41 @@ -name: haddock -cabal-version: >=1.1.4 -version: 2.0 -license: BSD3 -license-file: LICENSE -copyright: (c) Simon Marlow -author: Simon Marlow -maintainer: Simon Marlow <simonmar@microsoft.com> -stability: stable -homepage: http://www.haskell.org/haddock/ -synopsis: Haddock is a documentation-generation tool for Haskell libraries -build-depends: base>=1.0, haskell98>=1.0, mtl>=1.0, network>=1.0 +build-type: Simple +name: haddock +version: 2.0 +license: BSD3 +license-file: LICENSE +copyright: (c) Simon Marlow, David Waern +author: Simon Marlow, David Waern +maintainer: David Waern <davve@dtek.chalmers.se> +stability: stable +homepage: http://www.haskell.org/haddock/ +synopsis: Haddock is a documentation-generation tool for Haskell + libraries +build-depends: + base, + haskell98, + mtl, + ghc>=6.8, + Cabal, + filepath, + process, + directory, + pretty, + containers, + array +extensions: CPP, PatternGuards +ghc-options: -fglasgow-exts +hs-source-dirs: src +exposed-modules: Distribution.Haddock +other-modules: + Haddock.Types + Haddock.InterfaceFile + Haddock.Exception data-files: - html/haddock-DEBUG.css - html/haddock.css - html/haddock.js - html/haskell_icon.gif - html/minus.gif + html/haddock-DEBUG.css + html/haddock.css + html/haddock.js + html/haskell_icon.gif + html/minus.gif html/plus.gif extra-source-files: CHANGES @@ -53,25 +73,30 @@ extra-source-files: haskell.vim src/haddock.sh -executable: haddock-ghc -hs-source-dirs: src -main-is: Main.hs -extensions: CPP, PatternGuards +executable: haddock +hs-source-dirs: src +main-is: Main.hs +extensions: CPP, PatternGuards +ghc-options: -fglasgow-exts -funbox-strict-fields -O2 -fasm other-modules: - FastMutInt2 - BlockTable - HaddockDB - HaddockDevHelp - HaddockHH - HaddockHH2 - HaddockHoogle - HaddockHtml - HaddockModuleTree - HaddockRename - HaddockTypes - HaddockUtil - HaddockVersion - Html - GHCUtils - Main - + Haddock.Interface.Rename + Haddock.Interface.Create + Haddock.Interface.AttachInstances + Haddock.Utils.FastMutInt2 + Haddock.Utils.BlockTable + Haddock.Utils.Html + Haddock.Utils + Haddock.Backends.HaddockDB + Haddock.Backends.DevHelp + Haddock.Backends.HH + Haddock.Backends.HH2 + Haddock.Backends.Hoogle + Haddock.ModuleTree + Haddock.Types + Haddock.Version + Haddock.InterfaceFile + Haddock.Exception + Haddock.Options + Haddock.GHC.Typecheck + Haddock.GHC.Utils + Haddock.GHC |