X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpaths.mk;h=b616e7d28db95287ac6aaab0f2b76a0c948503d6;hp=5c8e891e82eb5dc2760a6f560c7add1158db5061;hb=0065d5ab628975892cea1ec7303f968c3338cbe1;hpb=13aca089b924f6ac3cd598e17b471ab38a1e3e78 diff --git a/mk/paths.mk b/mk/paths.mk index 5c8e891..b616e7d 100644 --- a/mk/paths.mk +++ b/mk/paths.mk @@ -53,6 +53,8 @@ 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)) \ @@ -76,6 +78,9 @@ ALL_SRCS = $(wildcard $(patsubst ./%, %, \ 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)) @@ -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))) +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)))) @@ -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)) -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) @@ -219,14 +230,15 @@ TAGS_C_SRCS=$(C_SRCS) # # 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 +# Specifically glafp-utils/mkdependC/mkdependC.prl and others in 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) \ $(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