[project @ 2001-06-06 12:24:00 by simonmar]

wibbles

diff --git a/mk/paths.mk b/mk/paths.mk
index 1bac9cf..7a22ab3 100644 (file)
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -110,8 +110,10 @@ INSTALL_DIR     = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier
 
 PRE_SRCS    = $(wildcard *.lhs *.hs *.c *.prl *.lprl *.lit *.verb *.hsc)
 
-DERIVED_SRCS = $(patsubst %.hsc, %.hs %_hsc.c %_hsc.h, \
-                 $(filter %.hsc, $(PRE_SRCS) ))
+HSC_SRCS     = $(filter %.hsc, $(PRE_SRCS))
+DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(HSC_SRCS)) \
+              $(patsubst %.hsc, %_hsc.c, $(HSC_SRCS)) \
+              $(patsubst %.hsc, %_hsc.h, $(HSC_SRCS))
 
 # EXCLUDED_SRCS can be set in the Makefile, otherwise it defaults to empty.
 EXCLUDED_DERIVED_SRCS = $(patsubst %.hsc,%.hs %_hsc.c, \
@@ -119,7 +121,7 @@ EXCLUDED_DERIVED_SRCS = $(patsubst %.hsc,%.hs %_hsc.c, \
 CLOSED_EXCLUDED_SRCS  = $(sort $(EXCLUDED_SRCS) $(EXCLUDED_DERIVED_SRCS))
 
 SRCS        = $(filter-out $(CLOSED_EXCLUDED_SRCS), \
-               $(sort $(PRE_SRCS) $(HSC_DERIVED_SRCS)))
+               $(sort $(PRE_SRCS) $(DERIVED_SRCS)))
 
 HS_SRCS            = $(filter %.lhs %.hs %.hc,$(sort $(SRCS) $(BOOT_SRCS)))
 HS_OBJS     = $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))