X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpaths.mk;h=9c51dcd0128a781d0a70a385d801578ac4826fda;hb=950c7dc13e9e5be6b3cb8ead25c2650de21c2ef8;hp=190b692a8b4c4954976081337ae3b4c9f8ea663c;hpb=f6f513426c23627f13a56674fcfd5f466373a427;p=ghc-hetmet.git

diff --git a/mk/paths.mk b/mk/paths.mk
index 190b692..9c51dcd 100644
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -209,6 +209,9 @@ EXCLUDED_C_SRCS = $(patsubst %.lhs, %_stub.c, $(HS_SRCS)) \
 		  $(patsubst %.gc, %_stub_ffi.h, $(GC_SRCS))
 endif
 
+# These are droppings from hsc2hs - ignore them if we see them.
+EXCLUDED_C_SRCS += $(patsubst %.hsc, %_hsc_make.c, $(HSC_SRCS))
+
 C_SRCS      = $(filter-out $(EXCLUDED_C_SRCS),$(filter %.c,$(SRCS)))
 C_OBJS      = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
 
@@ -270,7 +273,11 @@ TAGS_C_SRCS=$(C_SRCS)
 #                        that may require extra tools to create.
 #
 #
-MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS) $(GC_C_OBJS) $(SCRIPT_OBJS)
+# NOTE: $(SCRIPT_OBJS) is not in MOSTLY_CLEAN_FILES, because in some
+# places in the tree it appears that we have source files in $(SCRIPT_OBJS).
+# Specifically glafp-utils/mkdependC/mkdependC.prl and others in ghc/driver and
+# possibly others elsewhere in the tree.  ToDo: fix this properly.
+MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS) $(GC_C_OBJS)
 CLEAN_FILES        += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
 		      $(PROG) $(LIBRARY) a.out \
 		      $(DERIVED_HSC_SRCS) \
@@ -344,3 +351,10 @@ SRC_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
 
 DLL_PEN = $(FPTOOLS_TOP)/dll
 
+#------------------------------------------------------------------
+#
+# Stylesheet for HTML generated from DocBook XML
+#
+
+FPTOOLS_CSS     = fptools.css
+FPTOOLS_CSS_ABS = $(FPTOOLS_TOP)/mk/$(FPTOOLS_CSS)