[project @ 2005-03-04 11:44:27 by simonmar]

Clean .hi-boot and .o-boot created from .hs-boot/.lhs-boot

diff --git a/mk/paths.mk b/mk/paths.mk
index 046347a..84f8988 100644 (file)
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -53,6 +53,8 @@
 ALL_SRCS    = $(wildcard $(patsubst ./%, %,  \
                   $(patsubst %,%/*.hs,   . $(ALL_DIRS)) \
                   $(patsubst %,%/*.lhs,  . $(ALL_DIRS)) \
+                  $(patsubst %,%/*.hs-boot,  . $(ALL_DIRS)) \
+                  $(patsubst %,%/*.lhs-boot, . $(ALL_DIRS)) \
                   $(patsubst %,%/*.y,    . $(ALL_DIRS)) \
                   $(patsubst %,%/*.ly,   . $(ALL_DIRS)) \
                   $(patsubst %,%/*.x,    . $(ALL_DIRS)) \
@@ -76,6 +78,9 @@ ALL_SRCS    = $(wildcard $(patsubst ./%, %,  \
 PRE_HS_SRCS  = $(filter %.hs,  $(PRE_SRCS))
 PRE_LHS_SRCS = $(filter %.lhs, $(PRE_SRCS))
 
+PRE_HS_BOOT_SRCS = $(filter %.hs-boot,  $(PRE_SRCS)) \
+                  $(filter %.lhs-boot, $(PRE_SRCS))
+
 GC_SRCS       = $(filter %.gc,  $(PRE_SRCS))
 HSC_SRCS      = $(filter %.hsc, $(PRE_SRCS))
 HAPPY_Y_SRCS  = $(filter %.y,   $(PRE_SRCS))
@@ -141,6 +146,12 @@ HS_SRCS        = $(filter %.lhs %.hs, $(sort $(SRCS) $(BOOT_SRCS)))
 HS_OBJS     = $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))
 HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_SRCS)))
 
+HI_BOOTS    = $(patsubst %.hs-boot, %.$(way_)hi-boot, \
+             $(patsubst %.lhs-boot, %.$(way_)hi-boot, $(PRE_HS_BOOT_SRCS)))
+
+O_BOOTS     = $(patsubst %.hs-boot, %.$(way_)o-boot, \
+             $(patsubst %.lhs-boot, %.$(way_)o-boot, $(PRE_HS_BOOT_SRCS)))
+
 GC_C_OBJS   = $(addsuffix _stub_ffi.$(way_)o,$(basename $(filter %.gc,$(SRCS))))
 HSC_C_OBJS  = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS))))
 
@@ -226,7 +237,8 @@ CLEAN_FILES        += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
                      $(PROG) $(LIBRARY) a.out \
                      $(DERIVED_HSC_SRCS) \
                      $(DERIVED_GC_SRCS) \
-                     $(patsubst %,%/*.$(way_)hi, . $(ALL_DIRS))
+                     $(patsubst %,%/*.$(way_)hi, . $(ALL_DIRS)) \
+                     $(HI_BOOTS) $(O_BOOTS)
 
 # we delete *all* the .hi files we can find, rather than just
 # $(HS_IFACES), because stale interfaces left around by modules which