From 11710479a4219024ba80416b385091bafab4da82 Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Thu, 4 Oct 2012 16:12:44 +0200
Subject: Depend on library for executable

The main motivation for this is to increase build speed.  In GHC's
source tree the library is not build, but all modules are now required
for the executable, so that GHC's validate will now detect build
failures for the library.
---
 haddock.cabal | 98 ++++++++++++++++++++++++++++-------------------------------
 1 file changed, 47 insertions(+), 51 deletions(-)

diff --git a/haddock.cabal b/haddock.cabal
index 42dc9771..ec274445 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -74,61 +74,57 @@ flag in-ghc-tree
 
 executable haddock
   default-language:     Haskell2010
-  -- In a GHC tree - in particular, in a source tarball - we don't
-  -- require alex or happy
-  if !flag(in-ghc-tree)
-    build-tools: alex >= 2.3, happy >= 1.18
-  build-depends:
-    base >= 4.3 && < 4.7,
-    filepath,
-    directory,
-    containers,
-    deepseq,
-    array,
-    xhtml >= 3000.2 && < 3000.3,
-    Cabal >= 1.10,
-    ghc >= 7.4 && < 7.8
+  main-is:              Main.hs
+  hs-source-dirs:       driver
+  ghc-options:          -funbox-strict-fields -O2 -Wall -fwarn-tabs
 
+  build-depends:
+    base >= 4.3 && < 4.7
   if flag(in-ghc-tree)
+    hs-source-dirs: src
     cpp-options: -DIN_GHC_TREE
+    build-depends:
+      filepath,
+      directory,
+      containers,
+      deepseq,
+      array,
+      xhtml >= 3000.2 && < 3000.3,
+      Cabal >= 1.10,
+      ghc >= 7.4 && < 7.8
+    other-modules:
+      Documentation.Haddock
+      Haddock
+      Haddock.Interface
+      Haddock.Interface.Rename
+      Haddock.Interface.Create
+      Haddock.Interface.AttachInstances
+      Haddock.Interface.LexParseRn
+      Haddock.Interface.ParseModuleHeader
+      Haddock.Lex
+      Haddock.Parse
+      Haddock.Utils
+      Haddock.Backends.Xhtml
+      Haddock.Backends.Xhtml.Decl
+      Haddock.Backends.Xhtml.DocMarkup
+      Haddock.Backends.Xhtml.Layout
+      Haddock.Backends.Xhtml.Names
+      Haddock.Backends.Xhtml.Themes
+      Haddock.Backends.Xhtml.Types
+      Haddock.Backends.Xhtml.Utils
+      Haddock.Backends.LaTeX
+      Haddock.Backends.HaddockDB
+      Haddock.Backends.Hoogle
+      Haddock.ModuleTree
+      Haddock.Types
+      Haddock.Doc
+      Haddock.Version
+      Haddock.InterfaceFile
+      Haddock.Options
+      Haddock.GhcUtils
+      Haddock.Convert
   else
-    build-depends: ghc-paths
-
-  main-is:              Main.hs
-  hs-source-dirs:       src, driver
-  ghc-options:          -funbox-strict-fields -O2 -Wall -fwarn-tabs
-
-  other-modules:
-    Documentation.Haddock
-    Haddock
-    Haddock.Interface
-    Haddock.Interface.Rename
-    Haddock.Interface.Create
-    Haddock.Interface.AttachInstances
-    Haddock.Interface.LexParseRn
-    Haddock.Interface.ParseModuleHeader
-    Haddock.Lex
-    Haddock.Parse
-    Haddock.Utils
-    Haddock.Backends.Xhtml
-    Haddock.Backends.Xhtml.Decl
-    Haddock.Backends.Xhtml.DocMarkup
-    Haddock.Backends.Xhtml.Layout
-    Haddock.Backends.Xhtml.Names
-    Haddock.Backends.Xhtml.Themes
-    Haddock.Backends.Xhtml.Types
-    Haddock.Backends.Xhtml.Utils
-    Haddock.Backends.LaTeX
-    Haddock.Backends.HaddockDB
-    Haddock.Backends.Hoogle
-    Haddock.ModuleTree
-    Haddock.Types
-    Haddock.Doc
-    Haddock.Version
-    Haddock.InterfaceFile
-    Haddock.Options
-    Haddock.GhcUtils
-    Haddock.Convert
+    build-depends:  haddock
 
 library
   default-language:     Haskell2010
-- 
cgit v1.2.3