[project @ 2001-06-27 10:35:48 by simonpj]

[ghc-hetmet.git] / mk / suffix.mk

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 26a4488..f4c5126 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -37,12 +37,12 @@ ifneq "$(BootingFromHc)" "YES"
 
 %.$(way_)o : %.hs
        $(HC_PRE_OPTS)
-       $(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
+       $(HC) $(HC_OPTS) -c $< -o $@
        $(HC_POST_OPTS)
 
 %.$(way_)o : %.lhs      
        $(HC_PRE_OPTS)
-       $(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
+       $(HC) $(HC_OPTS) -c $< -o $@
        $(HC_POST_OPTS)
 
 %.$(way_)hc : %.lhs     
@@ -55,17 +55,17 @@ ifneq "$(BootingFromHc)" "YES"
 
 %.$(way_)o : %.$(way_)hc 
        $(HC_PRE_OPTS)
-       $(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
+       $(HC) $(HC_OPTS) -c $< -o $@
        $(HC_POST_OPTS)
 
 %.$(way_)o : %.hc 
        $(HC_PRE_OPTS)
-       $(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
+       $(HC) $(HC_OPTS) -c $< -o $@
        $(HC_POST_OPTS)
 
 %.$(way_)s : %.$(way_)hc 
        $(HC_PRE_OPTS)
-       $(HC) $(HC_OPTS) -S $< -o $@ -osuf $(subst .,,$(suffix $@))
+       $(HC) $(HC_OPTS) -S $< -o $@
        $(HC_POST_OPTS)
 
 %.$(way_)hc : %.lhc
@@ -114,7 +114,8 @@ endif # BootingViaC
 #
 ifneq "$(BootingFromHc)" "YES"
 %_hsc.c %_hsc.h %.hs : %.hsc
-       $(HSC2HS) $<
+       $(HSC2HS) $(HSC2HS_OPTS) $<
+       @touch $(patsubst %.hsc,%_hsc.c,$<)
 endif
 
 #-----------------------------------------------------------------------------