X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package.mk;h=c735e5137a60410c1c6377a200e34af08e1b4355;hb=d45197aabb22178066a8ec50d29331786a0c518c;hp=74ffbbd925616109cdb1aa979fe8b2ccd9bb67fa;hpb=eb3a1aecac72d22c618b4050fb88eac9055b527a;p=ghc-hetmet.git

diff --git a/rules/build-package.mk b/rules/build-package.mk
index 74ffbbd..c735e51 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -82,7 +82,7 @@ $(call build-package-data,$1,$2,$3)
 ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
 ifeq "$3" "0"
 include $1/$2/package-data.mk
-else ifeq "$(phase)" ""
+else ifeq "$(phase)" "final"
 include $1/$2/package-data.mk
 endif
 endif
@@ -100,21 +100,7 @@ $(call hs-sources,$1,$2)
 $(call c-sources,$1,$2)
 $(call includes-sources,$1,$2)
 
-# --- DEPENDENCIES
-# We always have the dependency rules available, as we need to know
-# how to build hsc2hs's dependency file in phase 0
-$(call build-dependencies,$1,$2,$3)
-ifneq "$(phase)" "0"
-# From phase 1 we actually include the dependency files for the
-# bootstrapping stuff
-ifeq "$3" "0"
-$(call include-dependencies,$1,$2,$3)
-else ifeq "$(phase)" ""
-# In the final phase, we also include the dependency files for
-# everything else
-$(call include-dependencies,$1,$2,$3)
-endif
-endif
+$(call dependencies,$1,$2,$3)
 
 # Now generate all the build rules for each way in this directory:
 $$(foreach way,$$($1_$2_WAYS),$$(eval \