X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=f3f3e9e1e3f286e84cca4d04a36f3d6e46c4ab25;hb=517410177449b9e7607d8333969cde0346d6f144;hp=e0d73ee915e324215385525b9ec355ef96956de3;hpb=737056a2093057f8183cd75e89a9a4434fde2f0a;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index e0d73ee..f3f3e9e 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -31,20 +31,18 @@ endif
 # Haskell Suffix Rules
 
 HASKELL_SPLIT_PRE= \
- if [ ! -d $(basename $@) ]; then mkdir $(basename $@) ; else exit 0; fi; \
+ $(RM) $@ ; if [ ! -d $(basename $@) ]; then mkdir $(basename $@) ; else exit 0; fi; \
  find $(basename $@) -name '*.$(way_)o' -print | xargs $(RM) __rm_food;
 HASKELL_SPLIT_POST= touch $@
 HASKELL_PRE_COMPILE=$(patsubst %,$(HASKELL_SPLIT_PRE),$(filter -split-objs,$(HC_OPTS)))
 HASKELL_POST_COMPILE=$(patsubst %,$(HASKELL_SPLIT_POST),$(filter -split-objs,$(HC_OPTS)))
 
 %.$(way_)o : %.hs
-	$(RM) $@
 	$(HASKELL_PRE_COMPILE)
 	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
 	$(HASKELL_POST_COMPILE)
 			 
 %.$(way_)o : %.lhs	 
-	$(RM) $@
 	$(HASKELL_PRE_COMPILE)
 	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
 	$(HASKELL_POST_COMPILE)
@@ -54,7 +52,6 @@ HASKELL_POST_COMPILE=$(patsubst %,$(HASKELL_SPLIT_POST),$(filter -split-objs,$(H
 	$(HC) $(HC_OPTS) -C $< -o $@
 			 
 %.$(way_)o : %.$(way_)hc 
-	$(RM) $@
 	$(HASKELL_PRE_COMPILE)
 	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
 	$(HASKELL_POST_COMPILE)
@@ -98,7 +95,6 @@ HASKELL_POST_COMPILE=$(patsubst %,$(HASKELL_SPLIT_POST),$(filter -split-objs,$(H
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules
 #
-.PRECIOUS: %.hs
 
 %.hs : %.lx
 	$(LX) $(LX_OPTS) $<
@@ -121,6 +117,9 @@ HASKELL_POST_COMPILE=$(patsubst %,$(HASKELL_SPLIT_POST),$(filter -split-objs,$(H
 %.c : %.flex
 	@$(RM) $@
 	$(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
+%.c : %.lex
+	@$(RM) $@
+	$(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
 
 #-----------------------------------------------------------------------------
 # Yacc stuff
@@ -182,7 +181,7 @@ HASKELL_POST_COMPILE=$(patsubst %,$(HASKELL_SPLIT_POST),$(filter -split-objs,$(H
 
 %.txt : %.lit
 	@$(RM) $@
-	$(LIT2TEXT) -c $(LIT2TEXT_OPTS) -o $@ $<
+	$(LIT2TEXT) $(LIT2TEXT_OPTS) -o $@ $<
 	@chmod 444 $@
 
 %.ihtml : %.lit