X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpaths.mk;h=0e55c3f1803675c6478a3ca024adcac3148787a5;hp=bbcdd787d8b403fb3fd2398af98242c18f90399d;hb=d1d6d84f5f551a9adef99237250e0375a556fa2e;hpb=1d280b65bc1e85d27c9037fb765fa415bfad8d09 diff --git a/mk/paths.mk b/mk/paths.mk index bbcdd78..0e55c3f 100644 --- a/mk/paths.mk +++ b/mk/paths.mk @@ -22,6 +22,7 @@ # INSTALL_LIBS (installed in $(libdir)) # INSTALL_LIBEXECS (installed in $(libexecdir)) # INSTALL_DATAS (installed in $(datadir)) +# INSTALL_IFACES (installed in $(ifacedir)) # # see target.mk for more information. # @@ -47,12 +48,13 @@ endif SRC_INSTALL_OPTS += $(INSTALL_OWNER) $(INSTALL_GROUP) # -# Invocations of `install' for the three different classes +# Invocations of `install' for the four different classes # of targets: # INSTALL_PROGRAM = $(INSTALL) -m 755 INSTALL_SCRIPT = $(INSTALL) -m 755 +INSTALL_SHLIB = $(INSTALL) -m 755 INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DIR = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier @@ -60,22 +62,18 @@ INSTALL_DIR = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier # The install variables does not have any defaults, # what files to install have to be specified in the Makefiles. # -#INSTALL_PROGS += $(HS_PROG) $(C_PROG) -#INSTALL_LIBS += $(LIBRARY) -#INSTALL_DATAS += $(HS_IFACES) ################################################################################# # # Standard variable names # ################################################################################# - -# -# The fptools mk setup defines a set of standard names which are used by the standard -# targets provided by mk. One example of this is the use of standard names -# for specifying what files to compile, their intermediate/object code, and -# the name of the final executable. Based on the settings of these variables, the -# standard targets will generate/expand rules that automatically compile and +# The fptools mk setup defines a set of standard names which are used +# by the standard targets provided by mk. One example of this is the +# use of standard names for specifying what files to compile, their +# intermediate/object code, and the name of the final +# executable. Based on the settings of these variables, the standard +# targets will generate/expand rules that automatically compile and # link your program. # # The general rules: @@ -85,21 +83,21 @@ INSTALL_DIR = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier # OBJS - object files (possibly prefixed). # # PROG - name of final executable - +# # We attempt to automatically devine the list of sources $(SRCS) to -# compile by looking in the current directory. This is complicated by -# the fact that a .hsc file gives rise to a .hs file (which needs to -# be automatically included in $(SRCS)), but the .hs file might -# already be present in the current directory and we don't want to -# compile it twice. - -# So we figure out the sources in three stages: first figure out -# what's in the current directory (this is $(PRE_SRCS)). Then figure -# out all the "derived" sources (eg. A.hsc generates A.hs and -# A_hsc.c), and finally put all these together and remove duplicates -# (GNU make's handy sort function does the duplicate removing). -# -# BOOT_SRCS: list of machine generated Haskell modules. +# compile by looking in the current directory (and possibly other +# directories which may be specified by setting the $(ALL_DIRS) +# variable). This is complicated by the fact that some files are +# derived from other files: eg. .hsc files give rise to -hsc.c and +# -hsc.h files, .ly files give rise to .hs files, and .hs files give +# rise to .hc files sometimes. + +# So we figure out the sources in three stages: first figure out what +# sources we can find (this is $(ALL_SRCS)). Then figure out all the +# "derived" sources (eg. A.hsc generates A.hs and A_hsc.c), and +# finally put all these together and remove duplicates (GNU make's +# handy sort function does the duplicate removing). + # HS_SRCS: list of Haskell modules you want to compile. # (also use by depend rule). # HS_OBJS: list of corresponding object files @@ -108,18 +106,78 @@ INSTALL_DIR = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier # (caveat: assuming no funny use of -hisuf and that # file name and module name match) -PRE_SRCS = $(wildcard *.lhs *.hs *.c *.prl *.lprl *.lit *.verb *.hsc) - -HSC_SRCS = $(filter %.hsc, $(PRE_SRCS)) -DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(HSC_SRCS)) \ - $(patsubst %.hsc, %_hsc.c, $(HSC_SRCS)) \ - $(patsubst %.hsc, %_hsc.h, $(HSC_SRCS)) +ALL_SRCS = $(wildcard $(patsubst ./%, %, \ + $(patsubst %,%/*.hs, . $(ALL_DIRS)) \ + $(patsubst %,%/*.lhs, . $(ALL_DIRS)) \ + $(patsubst %,%/*.y, . $(ALL_DIRS)) \ + $(patsubst %,%/*.ly, . $(ALL_DIRS)) \ + $(patsubst %,%/*.c, . $(ALL_DIRS)) \ + $(patsubst %,%/*.hc, . $(ALL_DIRS)) \ + $(patsubst %,%/*.S, . $(ALL_DIRS)) \ + $(patsubst %,%/*.prl, . $(ALL_DIRS)) \ + $(patsubst %,%/*.lprl, . $(ALL_DIRS)) \ + $(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 +# target.mk. Otherwise, we end up re-computing ALL_SRCS every time it +# is expanded (it is used in several variables below, and these +# variables are used in several others, etc.), which can really slow +# down make. + +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) + +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)) \ + $(patsubst %.hsc, %_hsc.h, $(HSC_SRCS)) \ + $(patsubst %.hsc, %.hc, $(HSC_SRCS)) + +DERIVED_HAPPY_SRCS = $(patsubst %.y, %.hs, $(HAPPY_Y_SRCS)) \ + $(patsubst %.ly, %.hs, $(HAPPY_LY_SRCS)) + +DERIVED_HC_SRCS = $(patsubst %.hs, %.hc, $(PRE_HS_SRCS)) \ + $(patsubst %.lhs, %.hc, $(PRE_LHS_SRCS)) + +DERIVED_SRCS = $(DERIVED_GC_SRCS) \ + $(DERIVED_HSC_SRCS) \ + $(DERIVED_HAPPY_SRCS) \ + $(DERIVED_HC_SRCS) # EXCLUDED_SRCS can be set in the Makefile, otherwise it defaults to empty. -EXCLUDED_HSC_SRCS = $(filter %.hsc, $(EXCLUDED_SRCS)) +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_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, $(HSC_SRCS)) + $(patsubst %.hsc, %_hsc.c, $(EXCLUDED_HSC_SRCS)) \ + $(patsubst %.hsc, %.hc, $(EXCLUDED_HSC_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 %.hs, %.hc, $(EXCLUDED_HS_SRCS)) \ + $(patsubst %.lhs, %.hc, $(EXCLUDED_LHS_SRCS)) \ + $(patsubst %.hs, %_stub.c, $(EXCLUDED_HS_SRCS)) \ + $(patsubst %.lhs, %_stub.c, $(EXCLUDED_LHS_SRCS)) + # Exclude _hsc.c files; they get built as part of the cbits library, # not part of the main library @@ -128,23 +186,34 @@ CLOSED_EXCLUDED_SRCS = $(sort $(EXCLUDED_SRCS) $(EXCLUDED_DERIVED_SRCS)) SRCS = $(filter-out $(CLOSED_EXCLUDED_SRCS), \ $(sort $(PRE_SRCS) $(DERIVED_SRCS))) -HS_SRCS = $(filter %.lhs %.hs %.hc,$(sort $(SRCS) $(BOOT_SRCS))) +HS_SRCS = $(filter %.lhs %.hs, $(sort $(SRCS) $(BOOT_SRCS))) HS_OBJS = $(addsuffix .$(way_)o,$(basename $(HS_SRCS))) -HS_HCS = $(addsuffix .$(way_)hc,$(basename $(HS_SRCS))) -HS_SS = $(addsuffix .$(way_)s,$(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)))) -C_SRCS = $(filter %.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 %.gc, %_stub_ffi.c, $(GC_SRCS)) \ + $(patsubst %.gc, %_stub_ffi.h, $(GC_SRCS)) +endif + +C_SRCS = $(filter-out $(EXCLUDED_C_SRCS),$(filter %.c,$(SRCS))) C_OBJS = $(addsuffix .$(way_)o,$(basename $(C_SRCS))) # SCRIPT_SRCS: list of raw script files (in literate form) # SCRIPT_OBJS: de-litted scripts -SCRIPT_SRCS=$(filter %.lprl,$(SRCS)) -SCRIPT_OBJS=$(addsuffix .prl,$(basename $(SCRIPT_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) $(SCRIPT_OBJS) +# The default is for $(LIBOBJS) to be the same as $(OBJS) +LIBOBJS = $(OBJS) # # Note that as long as you use the standard variables for setting @@ -173,7 +242,7 @@ MKDEPENDC_SRCS=$(C_SRCS) # # make TAGS defaults # -# The default set of files for the dependency generators to work on +# The default set of files for the TAGS file generators to work on # is just their source equivalents. # TAGS_HS_SRCS=$(HS_SRCS) @@ -194,18 +263,25 @@ TAGS_C_SRCS=$(C_SRCS) # that may require extra tools to create. # # -MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS) +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) $(HS_IFACES) $(HS_SS) a.out \ - $(DERIVED_SRCS) + $(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 +# $(HS_IFACES), because stale interfaces left around by modules which +# don't exist any more can screw up the build. # Don't clean the .hc files if we're bootstrapping ifneq "$(BootingFromHc)" "YES" -CLEAN_FILES += $(HS_HCS) +CLEAN_FILES += $(DERIVED_HC_SRCS) endif -DIST_CLEAN_FILES += .depend -MAINTAINER_CLEAN_FILES += $(BOOT_SRCS) +DIST_CLEAN_FILES += .depend* *.hp *.prof + +MAINTAINER_CLEAN_FILES += $(BOOT_SRCS) $(DERIVED_HAPPY_SRCS) # # `Standard' set of files to clean out.