X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpaths.mk;h=4485af1095035c652e91cdd90398bfa9a481a748;hb=85cfa3bba9bdab7d71529c7a959480842fc13368;hp=0cb1e2d8803d4ee496fbfc344ba3b5c9ab123e61;hpb=50027272414438955dbc41696541cbd25da55883;p=ghc-hetmet.git

diff --git a/mk/paths.mk b/mk/paths.mk
index 0cb1e2d..4485af1 100644
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -97,16 +97,22 @@ INSTALL_DIR     = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier
 #             (caveat: assuming no funny use of -hisuf and that
 #               file name and module name match)
 
-SRCS=$(wildcard *.lhs *.hs *.c *.prl *.lprl *.lit *.verb)
+SRCS     = $(sort $(wildcard *.lhs *.hs *.c *.prl *.lprl *.lit *.verb) \
+                  $(HSC_HS_SRCS) $(HSC_C_SRCS) )
 
-HS_SRCS=$(filter %.lhs %.hs %.hc,$(sort $(SRCS) $(BOOT_SRCS)))
-HS_OBJS=$(addsuffix .$(way_)o,$(basename $(HS_SRCS)))
-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_SRCS    = $(wildcard *.hsc)
+HSC_HS_SRCS = $(patsubst %.hsc,%.hs,$(HSC_SRCS))
+HSC_C_SRCS  = $(patsubst %.hsc,%_hsc.c,$(HSC_SRCS))
+HSC_C_OBJS  = $(patsubst %.hsc,%_hsc.o,$(HSC_SRCS))
 
-C_SRCS=$(filter %.c,$(SRCS))
-C_OBJS=$(addsuffix .$(way_)o,$(basename $(C_SRCS)))
+HS_SRCS	    = $(filter %.lhs %.hs %.hc,$(sort $(SRCS) $(BOOT_SRCS)))
+HS_OBJS     = $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))
+HS_HCS      = $(addsuffix .$(way_)hc,$(basename $(HS_SRCS)))
+HS_SS       = $(addsuffix .$(way_)s,$(basename $(HS_SRCS)))
+HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_SRCS)))
+
+C_SRCS      = $(filter %.c,$(SRCS)) 
+C_OBJS      = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
 
 # SCRIPT_SRCS:  list of raw script files (in literate form)
 # SCRIPT_OBJS:  de-litted scripts
@@ -136,7 +142,7 @@ else
 MKDEPENDHS_SRCS=
 endif
 
-MKDEPENDC_SRCS=$(C_SRCS)
+MKDEPENDC_SRCS=$(C_SRCS) 
 
 #------------------------------------------------------------------
 #
@@ -163,10 +169,12 @@ TAGS_C_SRCS=$(C_SRCS)
 #                        that may require extra tools to create.
 #
 #
-MOSTLY_CLEAN_FILES     += $(HS_OBJS) $(C_OBJS)
-CLEAN_FILES            += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
-			  $(PROG) $(LIBRARY) $(HS_IFACES) $(HS_SS) \
-			  a.out
+MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS)
+CLEAN_FILES        += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
+		      $(PROG) $(LIBRARY) $(HS_IFACES) $(HS_SS) a.out \
+		      $(patsubst %.hsc,%.hs,$(HSC_SRCS)) \
+		      $(patsubst %.hsc,%_hsc.c,$(HSC_SRCS)) \
+		      $(patsubst %.hsc,%_hsc.h,$(HSC_SRCS))
 
 # Don't clean the .hc files if we're bootstrapping
 ifneq "$(BootingFromHc)" "YES"