X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpaths.mk;h=9c51dcd0128a781d0a70a385d801578ac4826fda;hb=0ba4b0a1104131cd6eae8d570c1e1a713094543c;hp=fa0c27ae503f92d4a2f14ea19966e55335ccd580;hpb=24148a7a631193a9c2ad172accd7e21bd9cdc8c1;p=ghc-hetmet.git diff --git a/mk/paths.mk b/mk/paths.mk index fa0c27a..9c51dcd 100644 --- a/mk/paths.mk +++ b/mk/paths.mk @@ -111,6 +111,7 @@ ALL_SRCS = $(wildcard $(patsubst ./%, %, \ $(patsubst %,%/*.lhs, . $(ALL_DIRS)) \ $(patsubst %,%/*.y, . $(ALL_DIRS)) \ $(patsubst %,%/*.ly, . $(ALL_DIRS)) \ + $(patsubst %,%/*.x, . $(ALL_DIRS)) \ $(patsubst %,%/*.c, . $(ALL_DIRS)) \ $(patsubst %,%/*.hc, . $(ALL_DIRS)) \ $(patsubst %,%/*.S, . $(ALL_DIRS)) \ @@ -119,6 +120,7 @@ ALL_SRCS = $(wildcard $(patsubst ./%, %, \ $(patsubst %,%/*.lit, . $(ALL_DIRS)) \ $(patsubst %,%/*.verb, . $(ALL_DIRS)) \ $(patsubst %,%/*.hsc, . $(ALL_DIRS)) \ + $(patsubst %,%/*.gc, . $(ALL_DIRS)) \ )) $(EXTRA_SRCS) # ALL_SRCS is computed once and for all into PRE_SRCS at the top of @@ -130,10 +132,16 @@ ALL_SRCS = $(wildcard $(patsubst ./%, %, \ PRE_HS_SRCS = $(filter %.hs, $(PRE_SRCS)) PRE_LHS_SRCS = $(filter %.lhs, $(PRE_SRCS)) +GC_SRCS = $(filter %.gc, $(PRE_SRCS)) HSC_SRCS = $(filter %.hsc, $(PRE_SRCS)) HAPPY_Y_SRCS = $(filter %.y, $(PRE_SRCS)) HAPPY_LY_SRCS = $(filter %.ly, $(PRE_SRCS)) HAPPY_SRCS = $(HAPPY_Y_SRCS) $(HAPPY_LY_SRCS) +ALEX_SRCS = $(filter %.x, $(PRE_SRCS)) + +DERIVED_GC_SRCS = $(patsubst %.gc, %.hs, $(GC_SRCS)) \ + $(patsubst %.gc, %_stub_ffi.c, $(GC_SRCS)) \ + $(patsubst %.gc, %_stub_ffi.h, $(GC_SRCS)) DERIVED_HSC_SRCS = $(patsubst %.hsc, %.hs, $(HSC_SRCS)) \ $(patsubst %.hsc, %_hsc.c, $(HSC_SRCS)) \ @@ -143,26 +151,35 @@ DERIVED_HSC_SRCS = $(patsubst %.hsc, %.hs, $(HSC_SRCS)) \ DERIVED_HAPPY_SRCS = $(patsubst %.y, %.hs, $(HAPPY_Y_SRCS)) \ $(patsubst %.ly, %.hs, $(HAPPY_LY_SRCS)) +DERIVED_ALEX_SRCS = $(patsubst %.x, %.hs, $(ALEX_SRCS)) + DERIVED_HC_SRCS = $(patsubst %.hs, %.hc, $(PRE_HS_SRCS)) \ $(patsubst %.lhs, %.hc, $(PRE_LHS_SRCS)) -DERIVED_SRCS = $(DERIVED_HSC_SRCS) \ +DERIVED_SRCS = $(DERIVED_GC_SRCS) \ + $(DERIVED_HSC_SRCS) \ $(DERIVED_HAPPY_SRCS) \ + $(DERIVED_ALEX_SRCS) \ $(DERIVED_HC_SRCS) # EXCLUDED_SRCS can be set in the Makefile, otherwise it defaults to empty. +EXCLUDED_GC_SRCS = $(filter %.gc, $(EXCLUDED_SRCS)) EXCLUDED_HSC_SRCS = $(filter %.hsc, $(EXCLUDED_SRCS)) EXCLUDED_HAPPY_Y_SRCS = $(filter %.y, $(EXCLUDED_SRCS)) EXCLUDED_HAPPY_LY_SRCS = $(filter %.ly, $(EXCLUDED_SRCS)) EXCLUDED_HAPPY_SRCS = $(EXCLUDED_HAPPY_Y_SRCS) $(EXCLUDED_HAPPY_LY_SRCS) +EXCLUDED_ALEX_SRCS = $(filter %.x, $(EXCLUDED_SRCS)) EXCLUDED_HS_SRCS = $(filter %.hs, $(EXCLUDED_SRCS)) EXCLUDED_LHS_SRCS = $(filter %.lhs, $(EXCLUDED_SRCS)) EXCLUDED_DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(EXCLUDED_HSC_SRCS)) \ $(patsubst %.hsc, %_hsc.h, $(EXCLUDED_HSC_SRCS)) \ $(patsubst %.hsc, %_hsc.c, $(EXCLUDED_HSC_SRCS)) \ $(patsubst %.hsc, %.hc, $(EXCLUDED_HSC_SRCS)) \ - $(patsubst %.y, %.hs, $(EXCLUDED_HAPPY_Y_SRCS)) \ + $(patsubst %.gc, %_stub_ffi.c, $(EXCLUDED_GC_SRCS)) \ + $(patsubst %.gc, %_stub_ffi.h, $(EXCLUDED_GC_SRCS)) \ + $(patsubst %.y, %.hs, $(EXCLUDED_HAPPY_Y_SRCS)) \ $(patsubst %.ly, %.hs, $(EXCLUDED_HAPPY_LY_SRCS)) \ + $(patsubst %.x, %.hs, $(EXCLUDED_ALEX_SRCS)) \ $(patsubst %.hs, %.hc, $(EXCLUDED_HS_SRCS)) \ $(patsubst %.lhs, %.hc, $(EXCLUDED_LHS_SRCS)) \ $(patsubst %.hs, %_stub.c, $(EXCLUDED_HS_SRCS)) \ @@ -180,12 +197,20 @@ 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))) +GC_C_OBJS = $(addsuffix _stub_ffi.$(way_)o,$(basename $(filter %.gc,$(SRCS)))) HSC_C_OBJS = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS)))) -# Always remove $(EXCLUDED_C_SRCS) from C_SRCS +ifeq "$(BootingFromHc)" "NO" +# We don't want to build the _stub.c files ourselves, unless we're +# bootstrapping from .hc files. EXCLUDED_C_SRCS = $(patsubst %.lhs, %_stub.c, $(HS_SRCS)) \ - $(patsubst %.hs, %_stub.c, $(HS_SRCS)) + $(patsubst %.hs, %_stub.c, $(HS_SRCS)) \ + $(patsubst %.gc, %_stub_ffi.c, $(GC_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))) @@ -195,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) +OBJS = $(HS_OBJS) $(C_OBJS) $(GC_C_OBJS) # The default is for $(LIBOBJS) to be the same as $(OBJS) LIBOBJS = $(OBJS) @@ -248,10 +273,15 @@ TAGS_C_SRCS=$(C_SRCS) # that may require extra tools to create. # # -MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_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) \ + $(DERIVED_GC_SRCS) \ $(patsubst %,%/*.$(way_)hi, . $(ALL_DIRS)) # we delete *all* the .hi files we can find, rather than just @@ -263,9 +293,9 @@ ifneq "$(BootingFromHc)" "YES" CLEAN_FILES += $(DERIVED_HC_SRCS) endif -DIST_CLEAN_FILES += .depend *.hp *.prof +DIST_CLEAN_FILES += .depend* *.hp *.prof -MAINTAINER_CLEAN_FILES += $(BOOT_SRCS) $(DERIVED_HAPPY_SRCS) +MAINTAINER_CLEAN_FILES += $(BOOT_SRCS) $(DERIVED_HAPPY_SRCS) $(DERIVED_ALEX_SRCS) # # `Standard' set of files to clean out. @@ -321,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)