[commit: dph] master: Update hacks in ghc.mk to follow module name changes (64aa68c)

[Ben Lippmeier]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/dph

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/64aa68cbb4fed620308cb3f793df71479fc0a8f9

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

commit 64aa68cbb4fed620308cb3f793df71479fc0a8f9
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Wed May 11 18:51:41 2011 +1000

    Update hacks in ghc.mk to follow module name changes

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

 ghc.mk |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 525b166..77efc24 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -49,15 +49,12 @@ endef
 
 $(foreach pkg, $(DPH_PACKAGES), $(eval $(call dph_package,$(pkg))))
 
+
 # When compiling modules that use TH.Repr, we will try to run some TH,
 # which means using the vanilla TH.Repr object files. If we are not
 # building in the vanilla way then we need to be sure that the vanilla
 # object files exist. These deps take care of that for us.
 #
-# We also need to make sure that the HSdph-prim-seq/par .o library
-# exists, so that GHC can load it.  The other libs already exist, because
-# we are building with stage 2 which is linked against them.
-#
 define dph_th_deps
 # $1 = way  $2 = par/seq
 ifneq "$1" "v"
@@ -65,10 +62,20 @@ libraries/dph/dph-$2/dist-install/build/Data/Array/Parallel/Lifted/TH/Repr.$$($1
 libraries/dph/dph-$2/dist-install/build/Data/Array/Parallel/Lifted/PArray.$${$1_osuf} : libraries/dph/dph-$2/dist-install/build/Data/Array/Parallel/Lifted/PArray.$${v_osuf}
 endif
 
+
+# We also need to make sure that the HSdph-prim-seq/par .o library
+# exists, so that GHC can load it.  The other libs already exist, because
+# we are building with stage 2 which is linked against them.
+#
+# The following two modules directly import Data.Array.Parallel.Unlifted, so the prim
+# library needs to be built first. 
+#
 libraries/dph/dph-$2/dist-install/build/Data/Array/Parallel/Lifted/TH/Repr.$$($1_osuf): $$(libraries/dph/dph-prim-$2_dist-install_GHCI_LIB)
-libraries/dph/dph-$2/dist-install/build/Data/Array/Parallel/Lifted/PArray.$${$1_osuf} : $$(libraries/dph/dph-prim-$2_dist-install_GHCI_LIB)
+
+libraries/dph/dph-$2/dist-install/build/Data/Array/Parallel/PArray/PData.$${$1_osuf} : $$(libraries/dph/dph-prim-$2_dist-install_GHCI_LIB)
 endef
 
+
 ifneq "$(CLEANING)" "YES"
 $(foreach way, $(GhcLibWays), $(eval $(call dph_th_deps,$(way),seq)))
 $(foreach way, $(GhcLibWays), $(eval $(call dph_th_deps,$(way),par)))