[commit: ghc] master: Small build system refactoring (8b1e30f)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8b1e30f79d6fb6aa2c35d93283f9208c6d54a927

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

commit 8b1e30f79d6fb6aa2c35d93283f9208c6d54a927
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Jan 11 13:14:29 2013 +0000

    Small build system refactoring
    
    hs-suffix-rules now calls hs-suffix-rules-srcdir, saving some duplication

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

 rules/build-package-way.mk |    2 --
 rules/build-prog.mk        |    2 --
 rules/hs-suffix-rules.mk   |    3 +++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk
index 76598de..aade4e9 100644
--- a/rules/build-package-way.mk
+++ b/rules/build-package-way.mk
@@ -17,8 +17,6 @@ $(call profStart, build-package-way($1,$2,$3))
 
 $(call distdir-way-opts,$1,$2,$3,$4)
 $(call hs-suffix-rules,$1,$2,$3)
-$$(foreach dir,$$($1_$2_HS_SRC_DIRS),\
-  $$(eval $$(call hs-suffix-rules-srcdir,$1,$2,$3,$$(dir))))
 
 $(call hs-objs,$1,$2,$3)
 
diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 2c1836a..4111e17 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -155,8 +155,6 @@ endif
 endif
 
 $(call hs-suffix-rules,$1,$2,$$($1_$2_PROGRAM_WAY))
-$$(foreach dir,$$($1_$2_HS_SRC_DIRS),\
-  $$(eval $$(call hs-suffix-rules-srcdir,$1,$2,$$($1_$2_PROGRAM_WAY),$$(dir))))
 
 $(call c-objs,$1,$2,$$($1_$2_PROGRAM_WAY))
 $(call hs-objs,$1,$2,$$($1_$2_PROGRAM_WAY))
diff --git a/rules/hs-suffix-rules.mk b/rules/hs-suffix-rules.mk
index 9b11e6e..fead7d1 100644
--- a/rules/hs-suffix-rules.mk
+++ b/rules/hs-suffix-rules.mk
@@ -34,5 +34,8 @@ $(call hi-rule,$1/$2/build/autogen,$1/$2/build,$3)
 endif
 endif
 
+$$(foreach dir,$$($1_$2_HS_SRC_DIRS),\
+  $$(eval $$(call hs-suffix-rules-srcdir,$1,$2,$3,$$(dir))))
+
 endef # hs-suffix-rules