[commit: ghc] master: Use Cabal to build hpc-bin (bbd9139)

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/bbd913984214d978ee1efe34cce0090669a2dd5e

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

commit bbd913984214d978ee1efe34cce0090669a2dd5e
Author: Ian Lynagh <[email protected]>
Date:   Sun Oct 14 15:54:45 2012 +0100

    Use Cabal to build hpc-bin

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

 utils/hpc/ghc.mk        |    6 ++----
 utils/hpc/hpc-bin.cabal |    9 +++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/utils/hpc/ghc.mk b/utils/hpc/ghc.mk
index 2485e16..917e099 100644
--- a/utils/hpc/ghc.mk
+++ b/utils/hpc/ghc.mk
@@ -10,10 +10,8 @@
 #
 # -----------------------------------------------------------------------------
 
-utils/hpc_dist-install_MODULES = Main HpcCombine HpcDraft HpcFlags HpcLexer \
-			 HpcMarkup HpcOverlay HpcParser HpcReport \
-			 HpcShowTix HpcUtils
-utils/hpc_dist-install_HC_OPTS         = -cpp -package hpc
+utils/hpc_USES_CABAL                   = YES
+utils/hpc_PACKAGE                      = hpc-bin
 utils/hpc_dist-install_INSTALL         = YES
 utils/hpc_dist-install_INSTALL_INPLACE = YES
 utils/hpc_dist-install_PROG            = hpc$(exeext)
diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal
index 133ea5f..bce8ea5 100644
--- a/utils/hpc/hpc-bin.cabal
+++ b/utils/hpc/hpc-bin.cabal
@@ -22,6 +22,15 @@ Flag base3
 Executable hpc
     Main-Is: Hpc.hs
     Other-Modules: HpcParser
+                   HpcCombine
+                   HpcDraft
+                   HpcFlags
+                   HpcLexer
+                   HpcMarkup
+                   HpcOverlay
+                   HpcReport
+                   HpcShowTix
+                   HpcUtils
 
     if flag(base4)
         Build-Depends: base       >= 4   && < 5