[project @ 2001-05-24 10:46:08 by simonmar]

Fixes for the hsc2hs rules.

diff --git a/mk/paths.mk b/mk/paths.mk
index 7c282a3..4485af1 100644 (file)
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -97,18 +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)
 
-HSC_SRCS = $(wildcard *.hsc)
-SRCS     = $(wildcard *.lhs *.hs *.c *.prl *.lprl *.lit *.verb) \
-           $(patsubst %.hsc,%.hs,$(HSC_SRCS))
+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
@@ -138,7 +142,7 @@ else
 MKDEPENDHS_SRCS=
 endif
 
-MKDEPENDC_SRCS=$(C_SRCS)
+MKDEPENDC_SRCS=$(C_SRCS) 
 
 #------------------------------------------------------------------
 #

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 693c6d9..f4c5126 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -115,6 +115,7 @@ endif # BootingViaC
 ifneq "$(BootingFromHc)" "YES"
 %_hsc.c %_hsc.h %.hs : %.hsc
        $(HSC2HS) $(HSC2HS_OPTS) $<
+       @touch $(patsubst %.hsc,%_hsc.c,$<)
 endif
 
 #-----------------------------------------------------------------------------

diff --git a/mk/target.mk b/mk/target.mk
index a337125..c022888 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -343,7 +343,7 @@ ifeq "$(LIBOBJS)" ""
   endif
 endif
 
-STUBOBJS += $(patsubst %.c,%.o,$(wildcard *_hsc.c))
+STUBOBJS += $(HSC_C_OBJS)
 SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR)
 
 ifeq "$(IS_CBITS_LIB)" "YES"