From ae587ec8ab4dd8414d629d3629dec0cc44b37aa7 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Thu, 14 Apr 2011 19:42:51 +0100
Subject: Refactor how dependencies are included; fixes #5109

This avoids duplicating some logic around the build system.
---
 rules/build-package.mk | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'rules/build-package.mk')

diff --git a/rules/build-package.mk b/rules/build-package.mk
index ac0a8eebce..c735e5137a 100644
--- a/rules/build-package.mk
+++ b/rules/build-package.mk
@@ -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)" "final"
-# 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 \
-- 
cgit v1.2.1