[commit: ghc] master: Rename hs-suffix-rules to hs-suffix-way-rules (676235f)

Ian Lynagh igloo at earth.li
Thu Feb 21 17:52:20 CET 2013


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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/676235fd5d3df209349bacc9047be321fe308c44

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

commit 676235fd5d3df209349bacc9047be321fe308c44
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Feb 21 14:31:34 2013 +0000

    Rename hs-suffix-rules to hs-suffix-way-rules

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

 ghc.mk                                             |    2 +-
 rules/build-package-way.mk                         |    2 +-
 rules/build-prog.mk                                |    2 +-
 .../{hs-suffix-rules.mk => hs-suffix-way-rules.mk} |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 5ea77b9..99ea239 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -227,7 +227,7 @@ include rules/cmm-objs.mk
 ifneq "$(CLEANING)" "YES"
 
 include rules/hs-suffix-rules-srcdir.mk
-include rules/hs-suffix-rules.mk
+include rules/hs-suffix-way-rules.mk
 include rules/hi-rule.mk
 include rules/c-suffix-rules.mk
 include rules/cmm-suffix-rules.mk
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk
index a8dfc5a..4621482 100644
--- a/rules/build-package-way.mk
+++ b/rules/build-package-way.mk
@@ -16,7 +16,7 @@ $(call trace, build-package-way($1,$2,$3))
 $(call profStart, build-package-way($1,$2,$3))
 
 $(call distdir-way-opts,$1,$2,$3,$4)
-$(call hs-suffix-rules,$1,$2,$3)
+$(call hs-suffix-way-rules,$1,$2,$3)
 
 $(call hs-objs,$1,$2,$3)
 
diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 3cbd713..69c5d75 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -154,7 +154,7 @@ $(call c-suffix-rules,$1,$2,$$($1_$2_PROGRAM_WAY),NO)
 endif
 endif
 
-$(call hs-suffix-rules,$1,$2,$$($1_$2_PROGRAM_WAY))
+$(call hs-suffix-way-rules,$1,$2,$$($1_$2_PROGRAM_WAY))
 
 $(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-way-rules.mk
similarity index 93%
rename from rules/hs-suffix-rules.mk
rename to rules/hs-suffix-way-rules.mk
index 5802591..50097cb 100644
--- a/rules/hs-suffix-rules.mk
+++ b/rules/hs-suffix-way-rules.mk
@@ -11,7 +11,7 @@
 # -----------------------------------------------------------------------------
 
 
-define hs-suffix-rules  # args: $1 = dir,  $2 = distdir, $3 = way
+define hs-suffix-way-rules  # args: $1 = dir,  $2 = distdir, $3 = way
 
 ifneq "$$(BINDIST)" "YES"
 
@@ -37,5 +37,5 @@ $(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
+endef # hs-suffix-way-rules
 





More information about the ghc-commits mailing list