diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-01-11 13:14:29 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-01-11 13:29:04 +0000 |
| commit | 8b1e30f79d6fb6aa2c35d93283f9208c6d54a927 (patch) | |
| tree | 8b51360e318f2ed704598870913c4d4b4b2da3e5 | |
| parent | fb7391ae2f2bd5261fc4f70766a36ec7285c007a (diff) | |
| download | haskell-8b1e30f79d6fb6aa2c35d93283f9208c6d54a927.tar.gz | |
Small build system refactoring
hs-suffix-rules now calls hs-suffix-rules-srcdir, saving some duplication
| -rw-r--r-- | rules/build-package-way.mk | 2 | ||||
| -rw-r--r-- | rules/build-prog.mk | 2 | ||||
| -rw-r--r-- | 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 76598debfa..aade4e93af 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 2c1836abed..4111e172b9 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 9b11e6e806..fead7d1d41 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 |