From 57c3ca2603ef0f2358d8d246bff1dd47ef97e843 Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Wed, 9 May 2001 09:55:41 +0000
Subject: [PATCH] [project @ 2001-05-09 09:55:41 by simonmar] Use -hcsuf to
 avoid clobbering .hc files when building several ways, and
 clean up the -osuf usage (put all the suffix-changing
 options in one place).

---
 mk/suffix.mk |   10 +++++-----
 mk/target.mk |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 26a4488..96a0403 100644
--- 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
diff --git a/mk/target.mk b/mk/target.mk
index 75c1576..295ec4c 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -305,7 +305,7 @@ endif
 
 # Object and interface files have suffixes tagged with their ways
 ifneq "$(way)" ""
-SRC_HC_OPTS += -hisuf $(way_)hi
+SRC_HC_OPTS += -hisuf $(way_)hi -hcsuf $(way_)hc -osuf $(way_)o
 endif
 
 #----------------------------------------
-- 
1.7.10.4