Commit 8b1e30f7 authored by ian@well-typed.com's avatar ian@well-typed.com

Small build system refactoring

hs-suffix-rules now calls hs-suffix-rules-srcdir, saving some duplication
parent fb7391ae
......@@ -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)
......
......@@ -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))
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment