X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpaths.mk;h=1bac9cf3e6d9ef35ad5b301ee12ec662e587d075;hb=003bc7cbbec233a047ce899b0ec6ebd2816752ed;hp=83a76b8a6d22a932e1a666a6873bf1d543da5df4;hpb=874d309255f603878dc31144c59a28d9dbca000f;p=ghc-hetmet.git

diff --git a/mk/paths.mk b/mk/paths.mk
index 83a76b8..1bac9cf 100644
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -85,8 +85,19 @@ INSTALL_DIR     = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier
 #   OBJS - object files (possibly prefixed).
 #
 #   PROG - name of final executable
-#
-#
+
+# We attempt to automatically devine the list of sources $(SRCS) to
+# compile by looking in the current directory.  This is complicated by
+# the fact that a .hsc file gives rise to a .hs file (which needs to
+# be automatically included in $(SRCS)), but the .hs file might
+# already be present in the current directory and we don't want to
+# compile it twice.
+
+# So we figure out the sources in three stages: first figure out
+# what's in the current directory (this is $(PRE_SRCS)).  Then figure
+# out all the "derived" sources (eg. A.hsc generates A.hs and
+# A_hsc.c), and finally put all these together and remove duplicates
+# (GNU make's handy sort function does the duplicate removing).
 #
 # BOOT_SRCS: list of machine generated Haskell modules.
 # HS_SRCS:   list of Haskell modules you want to compile.
@@ -97,16 +108,29 @@ 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 *.lc *.prl *.lprl *.lit *.verb)
+PRE_SRCS    = $(wildcard *.lhs *.hs *.c *.prl *.lprl *.lit *.verb *.hsc)
+
+DERIVED_SRCS = $(patsubst %.hsc, %.hs %_hsc.c %_hsc.h, \
+		  $(filter %.hsc, $(PRE_SRCS) ))
+
+# EXCLUDED_SRCS can be set in the Makefile, otherwise it defaults to empty.
+EXCLUDED_DERIVED_SRCS = $(patsubst %.hsc,%.hs %_hsc.c, \
+			    $(filter %.hsc, $(EXCLUDED_SRCS)))
+CLOSED_EXCLUDED_SRCS  = $(sort $(EXCLUDED_SRCS) $(EXCLUDED_DERIVED_SRCS))
+
+SRCS        = $(filter-out $(CLOSED_EXCLUDED_SRCS), \
+	        $(sort $(PRE_SRCS) $(HSC_DERIVED_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)))
+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 %.lc %.c,$(SRCS))
-C_OBJS=$(addsuffix .$(way_)o,$(basename $(C_SRCS)))
+HSC_C_OBJS  = $(patsubst %_hsc.c,%_hsc.o,$(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
@@ -129,8 +153,14 @@ OBJS=$(HS_OBJS) $(C_OBJS) $(SCRIPT_OBJS)
 # The default set of files for the dependency generators to work on
 # is just their source equivalents.
 # 
+
+ifneq "$(BootingFromHc)" "YES"
 MKDEPENDHS_SRCS=$(HS_SRCS)
-MKDEPENDC_SRCS=$(C_SRCS)
+else
+MKDEPENDHS_SRCS=
+endif
+
+MKDEPENDC_SRCS=$(C_SRCS) 
 
 #------------------------------------------------------------------
 #
@@ -157,10 +187,15 @@ 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_HCS) $(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 \
+		      $(DERIVED_SRCS)
+
+# Don't clean the .hc files if we're bootstrapping
+ifneq "$(BootingFromHc)" "YES"
+CLEAN_FILES += $(HS_HCS)
+endif
 
 DIST_CLEAN_FILES += .depend
 MAINTAINER_CLEAN_FILES += $(BOOT_SRCS)