X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fhs-suffix-rules-srcdir.mk;h=168a880521f72caed53c1f038480f81055e7f6a9;hb=7720e1503ee9b6ea2b949f95287a32b8d3361bb0;hp=a08fac70e7b2547fa642362fcc111e73ab911722;hpb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b;p=ghc-hetmet.git diff --git a/rules/hs-suffix-rules-srcdir.mk b/rules/hs-suffix-rules-srcdir.mk index a08fac7..168a880 100644 --- a/rules/hs-suffix-rules-srcdir.mk +++ b/rules/hs-suffix-rules-srcdir.mk @@ -18,22 +18,17 @@ define hs-suffix-rules-srcdir ifneq "$$(BootingFromHc)" "YES" -$1/$2/build/%.hs : $1/$4/%.ly $$(MKDIRHIER) - "$$(MKDIRHIER)" $$(dir $$@) +$1/$2/build/%.hs : $1/$4/%.ly | $$$$(dir $$$$@)/. "$$(HAPPY)" $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@ -$1/$2/build/%.hs : $1/$4/%.y $$(MKDIRHIER) - "$$(MKDIRHIER)" $$(dir $$@) +$1/$2/build/%.hs : $1/$4/%.y | $$$$(dir $$$$@)/. "$$(HAPPY)" $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@ -$1/$2/build/%.hs : $1/$4/%.x $$(MKDIRHIER) - "$$(MKDIRHIER)" $$(dir $$@) +$1/$2/build/%.hs : $1/$4/%.x | $$$$(dir $$$$@)/. "$$(ALEX)" $$($1_$2_$3_ALL_ALEX_OPTS) $$< -o $$@ -$1/$2/build/%_hsc.c $1/$2/build/%_hsc.h $1/$2/build/%.hs : $1/$4/%.hsc $$(HSC2HS_INPLACE) - "$$(MKDIRHIER)" $$(dir $$@) +$1/$2/build/%_hsc.c $1/$2/build/%_hsc.h $1/$2/build/%.hs : $1/$4/%.hsc $$(HSC2HS_INPLACE) | $$$$(dir $$$$@)/. "$$(HSC2HS_INPLACE)" $$($1_$2_$3_ALL_HSC2HS_OPTS) $$< -o $$@ - touch $$(patsubst %.hsc,%_hsc.c,$$<) # Compiling Haskell source @@ -54,8 +49,7 @@ endif # XXX: for some reason these get used in preference to the direct # .hs->.o rule, I don't know why --SDM -$1/$2/build/%.$$($3_osuf) : $1/$4/%.hc includes/ghcautoconf.h includes/ghcplatform.h $$(MKDIRHIER) - "$$(MKDIRHIER)" $$(dir $$@) +$1/$2/build/%.$$($3_osuf) : $1/$4/%.hc includes/ghcautoconf.h includes/ghcplatform.h | $$$$(dir $$$$@)/. "$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@ $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc includes/ghcautoconf.h includes/ghcplatform.h