[project @ 2001-07-24 04:52:49 by ken]

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

diff --git a/mk/paths.mk b/mk/paths.mk
index a0bb7f7..fd128ae 100644 (file)
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -119,7 +119,9 @@ DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(HSC_SRCS)) \
 EXCLUDED_HSC_SRCS     = $(filter %.hsc, $(EXCLUDED_SRCS))
 EXCLUDED_DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(EXCLUDED_HSC_SRCS)) \
                        $(patsubst %.hsc, %_hsc.h, $(EXCLUDED_HSC_SRCS)) \
-                       $(patsubst %.hsc, %_hsc.c, $(EXCLUDED_HSC_SRCS))
+                       $(patsubst %.hsc, %_hsc.c, $(HSC_SRCS))
+# Exclude _hsc.c files; they get built as part of the cbits library,
+# not part of the main library
 
 CLOSED_EXCLUDED_SRCS  = $(sort $(EXCLUDED_SRCS) $(EXCLUDED_DERIVED_SRCS))
 
@@ -132,7 +134,7 @@ HS_HCS      = $(addsuffix .$(way_)hc,$(basename $(HS_SRCS)))
 HS_SS       = $(addsuffix .$(way_)s,$(basename $(HS_SRCS)))
 HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_SRCS)))
 
-HSC_C_OBJS  = $(patsubst %.hsc, %_hsc.o, $(HSC_SRCS))
+HSC_C_OBJS  = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS))))
 
 C_SRCS      = $(filter %.c,$(SRCS)) 
 C_OBJS      = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
@@ -211,7 +213,7 @@ MAINTAINER_CLEAN_FILES += $(BOOT_SRCS)
 MOSTLY_CLEAN_FILES += \
  *.CKP *.ln *.BAK *.bak .*.bak *.o *core a.out errs ,* *.a .emacs_*  \
  tags TAGS *.ind *.ilg *.idx *.idx-prev *.aux *.aux-prev *.dvi *.log \
- *.toc *.lot *.lof *.blg *.cb *_stub.c *_stub.h *.raw_s
+ *.toc *.lot *.lof *.blg *.cb *_stub.c *_stub.h *.raw_s *.a.list
 
 #------------------------------------------------------------------
 #