diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-02-21 15:05:22 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-02-21 15:05:22 +0000 |
| commit | 0565f88e41bcd33fff52d884e2747c333d5d122e (patch) | |
| tree | 0940bd985194022bb65d75fa83d7d66b20db91fc /rules/hs-suffix-way-rules-srcdir.mk | |
| parent | eb90651b42be335e12b814e7f44d7b92ba844352 (diff) | |
| download | haskell-0565f88e41bcd33fff52d884e2747c333d5d122e.tar.gz | |
Split non-way-specific variables off from distdir-way-opts into distdir-opts
The hsc2hs, alex and happy options variables are now also
non-way-specific, as the files are shared between all ways.
Diffstat (limited to 'rules/hs-suffix-way-rules-srcdir.mk')
| -rw-r--r-- | rules/hs-suffix-way-rules-srcdir.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rules/hs-suffix-way-rules-srcdir.mk b/rules/hs-suffix-way-rules-srcdir.mk index 204ddcfa7e..bbdd093552 100644 --- a/rules/hs-suffix-way-rules-srcdir.mk +++ b/rules/hs-suffix-way-rules-srcdir.mk @@ -19,22 +19,22 @@ define hs-suffix-way-rules-srcdir ifneq "$$(BINDIST)" "YES" $1/$2/build/%.hs : $1/$4/%.ly | $$$$(dir $$$$@)/. - $$(call cmd,HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@ + $$(call cmd,HAPPY) $$($1_$2_ALL_HAPPY_OPTS) $$< -o $$@ $1/$2/build/%.hs : $1/$4/%.y | $$$$(dir $$$$@)/. - $$(call cmd,HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@ + $$(call cmd,HAPPY) $$($1_$2_ALL_HAPPY_OPTS) $$< -o $$@ $1/$2/build/%.hs : $1/$2/build/%.ly | $$$$(dir $$$$@)/. - $$(call cmd,HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@ + $$(call cmd,HAPPY) $$($1_$2_ALL_HAPPY_OPTS) $$< -o $$@ $1/$2/build/%.hs : $1/$2/build/%.y | $$$$(dir $$$$@)/. - $$(call cmd,HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@ + $$(call cmd,HAPPY) $$($1_$2_ALL_HAPPY_OPTS) $$< -o $$@ $1/$2/build/%.hs : $1/$4/%.x | $$$$(dir $$$$@)/. - $$(call cmd,ALEX) $$($1_$2_$3_ALL_ALEX_OPTS) $$< -o $$@ + $$(call cmd,ALEX) $$($1_$2_ALL_ALEX_OPTS) $$< -o $$@ $1/$2/build/%_hsc.c $1/$2/build/%_hsc.h $1/$2/build/%.hs : $1/$4/%.hsc $$(HSC2HS_INPLACE) | $$$$(dir $$$$@)/. - $$(call cmd,HSC2HS_INPLACE) $$($1_$2_$3_ALL_HSC2HS_OPTS) $$< -o $$@ + $$(call cmd,HSC2HS_INPLACE) $$($1_$2_ALL_HSC2HS_OPTS) $$< -o $$@ # Compiling Haskell source |