Wed Jul 8 08:28:00 UTC 2015

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.15,2.15.0.1,2.15.0.2,T6018-injective-type-families,adamse-D1033,clean,fix-travis,ghc-head,master,metainfo,v2.15,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T8584,wip/T9840,wip/api-ann-hstylit,wip/api-ann-hstylit-1,wip/api-ann-hstylit-2,wip/api-ann-hstylit-3,wip/api-ann-hstylit-4,wip/api-ann-hstylit-5,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/ast-annotations-separate,wip/ast-prepare-annotations,wip/ast-prepare-annotations-final,wip/ast-prepare-annotations-final2,wip/ast-prepare-annotations-final3,wip/ast-prepare-annotations-final4,wip/ast-prepare-annotations-final5,wip/ast-prepare-annotations-final6,wip/attoparsec-update,wip/landmine-param-family,wip/orf-new,wip/orf-reboot,wip/pattern-synonyms,wip/rae,wip/remove-cabal-dep,wip/trac-9744
Link       : http://git.haskell.org/haddock.git/commitdiff/a19af87d6bfee1abc6c179f79eb391b381a26d81

>---------------------------------------------------------------

commit a19af87d6bfee1abc6c179f79eb391b381a26d81
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Wed May 14 02:23:55 2014 +0200

    Please the GHC build-system.
    
    As I can not figure out how to do this properly, if we're in GHC tree,
    we treat the library as being the same package. If we're not in the
    tree, we require that the library be installed separately.


>---------------------------------------------------------------

a19af87d6bfee1abc6c179f79eb391b381a26d81
 haddock.cabal | 49 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/haddock.cabal b/haddock.cabal
index b308a02..6485815 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -73,7 +73,7 @@ executable haddock
   build-depends:
     base >= 4.3 && < 4.8
   if flag(in-ghc-tree)
-    hs-source-dirs: src, vendor/attoparsec-0.10.4.0
+    hs-source-dirs: src, haddock-library/vendor/attoparsec-0.10.4.0, haddock-library/src
     cpp-options: -DIN_GHC_TREE
     build-depends:
       filepath,
@@ -84,10 +84,24 @@ executable haddock
       xhtml >= 3000.2 && < 3000.3,
       Cabal >= 1.10,
       ghc == 7.9.*,
-      bytestring,
-      haddock-library
+      bytestring
 
     other-modules:
+      Documentation.Haddock.Parser
+      Documentation.Haddock.Types
+      Documentation.Haddock.Doc
+      Data.Attoparsec
+      Data.Attoparsec.ByteString
+      Data.Attoparsec.ByteString.Char8
+      Data.Attoparsec.Combinator
+      Data.Attoparsec.Number
+      Data.Attoparsec.ByteString.FastSet
+      Data.Attoparsec.ByteString.Internal
+      Data.Attoparsec.Internal
+      Data.Attoparsec.Internal.Types
+      Documentation.Haddock.Utf8
+      Documentation.Haddock.Parser.Util
+
       Documentation.Haddock
       Haddock
       Haddock.Interface
@@ -97,7 +111,6 @@ executable haddock
       Haddock.Interface.LexParseRn
       Haddock.Interface.ParseModuleHeader
       Haddock.Parser
-      Haddock.Utf8
       Haddock.Utils
       Haddock.Backends.Xhtml
       Haddock.Backends.Xhtml.Decl
@@ -134,15 +147,35 @@ library
     array,
     xhtml >= 3000.2 && < 3000.3,
     Cabal >= 1.10,
-    ghc == 7.9.*,
-    haddock-library
+    ghc == 7.9.*
 
   if flag(in-ghc-tree)
     cpp-options: -DIN_GHC_TREE
+    hs-source-dirs:       src, haddock-library/vendor/attoparsec-0.10.4.0, haddock-library/src
+
+    exposed-modules:
+      Documentation.Haddock.Parser
+      Documentation.Haddock.Types
+      Documentation.Haddock.Doc
+
+    other-modules:
+      Data.Attoparsec
+      Data.Attoparsec.ByteString
+      Data.Attoparsec.ByteString.Char8
+      Data.Attoparsec.Combinator
+      Data.Attoparsec.Number
+      Data.Attoparsec.ByteString.FastSet
+      Data.Attoparsec.ByteString.Internal
+      Data.Attoparsec.Internal
+      Data.Attoparsec.Internal.Types
+      Documentation.Haddock.Utf8
+      Documentation.Haddock.Parser.Util
+
   else
-    build-depends: ghc-paths
+    build-depends: ghc-paths, haddock-library
+    hs-source-dirs:       src
+
 
-  hs-source-dirs:       src
   if flag(dev)
     ghc-options:          -funbox-strict-fields -Wall -fwarn-tabs
   else

