X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpaths.mk;h=bbcdd787d8b403fb3fd2398af98242c18f90399d;hb=1d280b65bc1e85d27c9037fb765fa415bfad8d09;hp=7a22ab3eaa203cfd1e09aa5ca297b8ae597395a1;hpb=afc85d41345579bcd6daa7cfd8f2cddc288651a6;p=ghc-hetmet.git

diff --git a/mk/paths.mk b/mk/paths.mk
index 7a22ab3..bbcdd78 100644
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -59,7 +59,7 @@ INSTALL_DIR     = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier
 #
 # The install variables does not have any defaults,
 # what files to install have to be specified in the Makefiles.
-# 
+#
 #INSTALL_PROGS += $(HS_PROG) $(C_PROG)
 #INSTALL_LIBS  += $(LIBRARY)
 #INSTALL_DATAS += $(HS_IFACES)
@@ -79,7 +79,7 @@ INSTALL_DIR     = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier
 # link your program.
 #
 # The general rules:
-#   
+#
 #   SRCS - sources, might be prefixed to indicate what type of source
 #          they are.
 #   OBJS - object files (possibly prefixed).
@@ -116,8 +116,13 @@ DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(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, \
-			    $(filter %.hsc, $(EXCLUDED_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, $(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))
 
 SRCS        = $(filter-out $(CLOSED_EXCLUDED_SRCS), \
@@ -129,9 +134,9 @@ 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.c,%_hsc.o,$(SRCS))
+HSC_C_OBJS  = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS))))
 
-C_SRCS      = $(filter %.c,$(SRCS)) 
+C_SRCS      = $(filter %.c,$(SRCS))
 C_OBJS      = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
 
 # SCRIPT_SRCS:  list of raw script files (in literate form)
@@ -154,7 +159,7 @@ 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)
@@ -162,7 +167,7 @@ else
 MKDEPENDHS_SRCS=
 endif
 
-MKDEPENDC_SRCS=$(C_SRCS) 
+MKDEPENDC_SRCS=$(C_SRCS)
 
 #------------------------------------------------------------------
 #
@@ -170,7 +175,7 @@ MKDEPENDC_SRCS=$(C_SRCS)
 #
 # The default set of files for the dependency generators to work on
 # is just their source equivalents.
-# 
+#
 TAGS_HS_SRCS=$(HS_SRCS)
 TAGS_C_SRCS=$(C_SRCS)
 
@@ -178,7 +183,7 @@ TAGS_C_SRCS=$(C_SRCS)
 # Clean file make-variables.
 #
 # The following three variables are used to control
-# what gets removed when doing `make clean' 
+# what gets removed when doing `make clean'
 #
 # MOSTLYCLEAN_FILES   object code etc., but not stuff
 #                     that is slow to recompile and/or stable
@@ -189,7 +194,7 @@ TAGS_C_SRCS=$(C_SRCS)
 #                        that may require extra tools to create.
 #
 #
-MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS)
+MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS)
 CLEAN_FILES        += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
 		      $(PROG) $(LIBRARY) $(HS_IFACES) $(HS_SS) a.out \
 		      $(DERIVED_SRCS)
@@ -206,21 +211,21 @@ MAINTAINER_CLEAN_FILES += $(BOOT_SRCS)
 # `Standard' set of files to clean out.
 #
 MOSTLY_CLEAN_FILES += \
- *.CKP *.ln *.BAK *.bak .*.bak *.o *core a.out errs ,* *.a .emacs_*  \
+ *.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
 
 #------------------------------------------------------------------
 #
 # Distribution setup
-# 
+#
 # Following variables are used for creating source and binary distributions:
 #
 #  SRC_DIST_NAME && BIN_DIST_NAME  -- the package names
 #
 #  SRC_DIST_FILES = list of extra files to include from a build tree into a source
 #                   distribution
-#  
+#
 #  SRC_DIST_DIR  = what the current directory in the source/build tree
 #                  maps to in the source distrib. tree being created.
 #
@@ -241,7 +246,7 @@ SRC_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
 #
 #  BIN_DIST_DIRS=   at the toplevel, list of directories to descend into when
 #		    building the distribution tree.
-#  
+#
 #  An extra directory variable that is set during bin-dists is $(bindist_top), giving
 #  the abs. path to the root of the binary installation tree. (useful when punting
 #  stuff like README and ANNOUNCE into a distrib, for instance)