Rename hs-suffix-rules to hs-suffix-way-rules
authorIan Lynagh <ian@well-typed.com>
Thu, 21 Feb 2013 14:31:34 +0000 (14:31 +0000)
committerIan Lynagh <ian@well-typed.com>
Thu, 21 Feb 2013 14:32:06 +0000 (14:32 +0000)
ghc.mk
rules/build-package-way.mk
rules/build-prog.mk
rules/hs-suffix-way-rules.mk [moved from rules/hs-suffix-rules.mk with 93% similarity]

diff --git a/ghc.mk b/ghc.mk
index 5ea77b9..99ea239 100644 (file)
--- 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
index a8dfc5a..4621482 100644 (file)
@@ -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)
 
index 3cbd713..69c5d75 100644 (file)
@@ -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))
similarity index 93%
rename from rules/hs-suffix-rules.mk
rename to rules/hs-suffix-way-rules.mk
index 5802591..50097cb 100644 (file)
@@ -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