[commit: ghc] master: Small build system refactoring; no functional changes (2e010ce)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2e010ce03d1b3c34a7f8b023dd76f1f5fc67dc9e

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

commit 2e010ce03d1b3c34a7f8b023dd76f1f5fc67dc9e
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Feb 21 14:17:51 2013 +0000

    Small build system refactoring; no functional changes

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

 rules/hs-suffix-rules-srcdir.mk |    2 --
 rules/hs-suffix-rules.mk        |    8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rules/hs-suffix-rules-srcdir.mk b/rules/hs-suffix-rules-srcdir.mk
index 2a0480f..029ea0b 100644
--- a/rules/hs-suffix-rules-srcdir.mk
+++ b/rules/hs-suffix-rules-srcdir.mk
@@ -50,8 +50,6 @@ $1/$2/build/%.$$($3_hcsuf) : $1/$4/%.hs $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_DEP) $$(
 $1/$2/build/%.$$($3_hcsuf) : $1/$4/%.lhs $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_DEP) $$($1_$2_PKGDATA_DEP)
 	$$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -C $$< -o $$@
 
-$(call hi-rule,$1/$4,$1/$2/build,$3)
-
 # XXX: for some reason these get used in preference to the direct
 # .hs->.o rule, I don't know why --SDM
 
diff --git a/rules/hs-suffix-rules.mk b/rules/hs-suffix-rules.mk
index 459ee37..5802591 100644
--- a/rules/hs-suffix-rules.mk
+++ b/rules/hs-suffix-rules.mk
@@ -27,13 +27,15 @@ $1/$2/build/%.$$($3_hcsuf) : $1/$2/build/autogen/%.hs $$(LAX_DEPS_FOLLOW) $$($1_
 $1/$2/build/%.$$($3_osuf) : $1/$2/build/autogen/%.hs $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_DEP)
 	$$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
 
-$(call hi-rule,$1/$2/build,$1/$2/build,$3)
-$(call hi-rule,$1/$2/build/autogen,$1/$2/build,$3)
-
 endif
 
 $$(foreach dir,$$($1_$2_HS_SRC_DIRS),\
   $$(eval $$(call hs-suffix-rules-srcdir,$1,$2,$3,$$(dir))))
 
+$(call hi-rule,$1/$2/build,$1/$2/build,$3)
+$(call hi-rule,$1/$2/build/autogen,$1/$2/build,$3)
+$$(foreach dir,$$($1_$2_HS_SRC_DIRS),\
+  $$(eval $$(call hi-rule,$1/$$(dir),$1/$2/build,$3)))
+
 endef # hs-suffix-rules