X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpaths.mk;h=5c88a620a737924adf960e158f5a0c22e6f43cd5;hb=69907617d58f6a97f7dc0b5e03b2fa0931ee686f;hp=18f81ea3af99c075dfa38924c02025681cf5eb9b;hpb=a84a8b4a69f455d24c26550652a5f94c8cb1134a;p=ghc-hetmet.git

diff --git a/mk/paths.mk b/mk/paths.mk
index 18f81ea..5c88a62 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)))
 
@@ -217,7 +220,7 @@ C_OBJS      = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
 SCRIPT_SRCS = $(filter %.lprl,$(SRCS))
 SCRIPT_OBJS = $(addsuffix .prl,$(basename $(SCRIPT_SRCS)))
 
-OBJS        = $(HS_OBJS) $(C_OBJS) $(SCRIPT_OBJS) $(GC_C_OBJS) 
+OBJS        = $(HS_OBJS) $(C_OBJS) $(GC_C_OBJS) 
 
 # The default is for $(LIBOBJS) to be the same as $(OBJS)
 LIBOBJS	    = $(OBJS)
@@ -270,6 +273,10 @@ TAGS_C_SRCS=$(C_SRCS)
 #                        that may require extra tools to create.
 #
 #
+# 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 \
@@ -344,3 +351,6 @@ SRC_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
 
 DLL_PEN = $(FPTOOLS_TOP)/dll
 
+#------------------------------------------------------------------
+
+FPTOOLS_CSS = $(FPTOOLS_TOP)/mk/fptools.css