projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change CVS for _darcs in dirs to prune during make dist
[ghc-hetmet.git]
/
mk
/
paths.mk
diff --git
a/mk/paths.mk
b/mk/paths.mk
index
5c8e891
..
84f8988
100644
(file)
--- a/
mk/paths.mk
+++ b/
mk/paths.mk
@@
-53,6
+53,8
@@
ALL_SRCS = $(wildcard $(patsubst ./%, %, \
$(patsubst %,%/*.hs, . $(ALL_DIRS)) \
$(patsubst %,%/*.lhs, . $(ALL_DIRS)) \
ALL_SRCS = $(wildcard $(patsubst ./%, %, \
$(patsubst %,%/*.hs, . $(ALL_DIRS)) \
$(patsubst %,%/*.lhs, . $(ALL_DIRS)) \
+ $(patsubst %,%/*.hs-boot, . $(ALL_DIRS)) \
+ $(patsubst %,%/*.lhs-boot, . $(ALL_DIRS)) \
$(patsubst %,%/*.y, . $(ALL_DIRS)) \
$(patsubst %,%/*.ly, . $(ALL_DIRS)) \
$(patsubst %,%/*.x, . $(ALL_DIRS)) \
$(patsubst %,%/*.y, . $(ALL_DIRS)) \
$(patsubst %,%/*.ly, . $(ALL_DIRS)) \
$(patsubst %,%/*.x, . $(ALL_DIRS)) \
@@
-76,6
+78,9
@@
ALL_SRCS = $(wildcard $(patsubst ./%, %, \
PRE_HS_SRCS = $(filter %.hs, $(PRE_SRCS))
PRE_LHS_SRCS = $(filter %.lhs, $(PRE_SRCS))
PRE_HS_SRCS = $(filter %.hs, $(PRE_SRCS))
PRE_LHS_SRCS = $(filter %.lhs, $(PRE_SRCS))
+PRE_HS_BOOT_SRCS = $(filter %.hs-boot, $(PRE_SRCS)) \
+ $(filter %.lhs-boot, $(PRE_SRCS))
+
GC_SRCS = $(filter %.gc, $(PRE_SRCS))
HSC_SRCS = $(filter %.hsc, $(PRE_SRCS))
HAPPY_Y_SRCS = $(filter %.y, $(PRE_SRCS))
GC_SRCS = $(filter %.gc, $(PRE_SRCS))
HSC_SRCS = $(filter %.hsc, $(PRE_SRCS))
HAPPY_Y_SRCS = $(filter %.y, $(PRE_SRCS))
@@
-141,6
+146,12
@@
HS_SRCS = $(filter %.lhs %.hs, $(sort $(SRCS) $(BOOT_SRCS)))
HS_OBJS = $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))
HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_SRCS)))
HS_OBJS = $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))
HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_SRCS)))
+HI_BOOTS = $(patsubst %.hs-boot, %.$(way_)hi-boot, \
+ $(patsubst %.lhs-boot, %.$(way_)hi-boot, $(PRE_HS_BOOT_SRCS)))
+
+O_BOOTS = $(patsubst %.hs-boot, %.$(way_)o-boot, \
+ $(patsubst %.lhs-boot, %.$(way_)o-boot, $(PRE_HS_BOOT_SRCS)))
+
GC_C_OBJS = $(addsuffix _stub_ffi.$(way_)o,$(basename $(filter %.gc,$(SRCS))))
HSC_C_OBJS = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS))))
GC_C_OBJS = $(addsuffix _stub_ffi.$(way_)o,$(basename $(filter %.gc,$(SRCS))))
HSC_C_OBJS = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS))))
@@
-156,7
+167,7
@@
endif
# These are droppings from hsc2hs - ignore them if we see them.
EXCLUDED_C_SRCS += $(patsubst %.hsc, %_hsc_make.c, $(HSC_SRCS))
# 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_SRCS = $(filter-out $(EXCLUDED_C_SRCS),$(filter %.c %.S,$(SRCS)))
C_OBJS = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
# SCRIPT_SRCS: list of raw script files (in literate form)
C_OBJS = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
# SCRIPT_SRCS: list of raw script files (in literate form)
@@
-226,7
+237,8
@@
CLEAN_FILES += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
$(PROG) $(LIBRARY) a.out \
$(DERIVED_HSC_SRCS) \
$(DERIVED_GC_SRCS) \
$(PROG) $(LIBRARY) a.out \
$(DERIVED_HSC_SRCS) \
$(DERIVED_GC_SRCS) \
- $(patsubst %,%/*.$(way_)hi, . $(ALL_DIRS))
+ $(patsubst %,%/*.$(way_)hi, . $(ALL_DIRS)) \
+ $(HI_BOOTS) $(O_BOOTS)
# we delete *all* the .hi files we can find, rather than just
# $(HS_IFACES), because stale interfaces left around by modules which
# we delete *all* the .hi files we can find, rather than just
# $(HS_IFACES), because stale interfaces left around by modules which