X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpaths.mk;h=1ed2ed9a3cd8ba9572bdf56487381e232b049f85;hb=d3bd93cf2747fabb8bd7c6df434c9ce98d0fc253;hp=5fae5b7c8a2f777b3e10d7d15b3b36c79316a898;hpb=2bb2cee7b721ee4bf49ba8b9979210c2d806c6fa;p=ghc-hetmet.git diff --git a/mk/paths.mk b/mk/paths.mk index 5fae5b7..1ed2ed9 100644 --- a/mk/paths.mk +++ b/mk/paths.mk @@ -47,19 +47,20 @@ 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 # # 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) @@ -79,7 +80,7 @@ INSTALL_DIR = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier # link your program. # # The general rules: -# +# # SRCS - sources, might be prefixed to indicate what type of source # they are. # OBJS - object files (possibly prefixed). @@ -94,10 +95,10 @@ INSTALL_DIR = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier # compile it twice. # So we figure out the sources in three stages: first figure out -# what's in the current directory. 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). +# 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. # HS_SRCS: list of Haskell modules you want to compile. @@ -110,12 +111,23 @@ INSTALL_DIR = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier PRE_SRCS = $(wildcard *.lhs *.hs *.c *.prl *.lprl *.lit *.verb *.hsc) -HSC_SRCS = $(filter %.hsc, $(PRE_SRCS)) -HSC_HS_SRCS = $(patsubst %.hsc,%.hs,$(HSC_SRCS)) -HSC_C_SRCS = $(patsubst %.hsc,%_hsc.c,$(HSC_SRCS)) -HSC_C_OBJS = $(patsubst %.hsc,%_hsc.o,$(HSC_SRCS)) +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)) + +# EXCLUDED_SRCS can be set in the Makefile, otherwise it defaults to empty. +EXCLUDED_HSC_SRCS = $(filter %.hsc, $(EXCLUDED_SRCS)) +EXCLUDED_DERIVED_SRCS = $(patsubst %.hsc, %.hs, $(EXCLUDED_HSC_SRCS)) \ + $(patsubst %.hsc, %_hsc.h, $(EXCLUDED_HSC_SRCS)) \ + $(patsubst %.hsc, %_hsc.c, $(HSC_SRCS)) +# Exclude _hsc.c files; they get built as part of the cbits library, +# not part of the main library -SRCS = $(sort $(PRE_SRCS) $(HSC_HS_SRCS) $(HSC_C_SRCS)) +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_OBJS = $(addsuffix .$(way_)o,$(basename $(HS_SRCS))) @@ -123,7 +135,9 @@ HS_HCS = $(addsuffix .$(way_)hc,$(basename $(HS_SRCS))) HS_SS = $(addsuffix .$(way_)s,$(basename $(HS_SRCS))) HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_SRCS))) -C_SRCS = $(filter %.c,$(SRCS)) +HSC_C_OBJS = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS)))) + +C_SRCS = $(filter %.c,$(SRCS)) C_OBJS = $(addsuffix .$(way_)o,$(basename $(C_SRCS))) # SCRIPT_SRCS: list of raw script files (in literate form) @@ -146,7 +160,7 @@ OBJS=$(HS_OBJS) $(C_OBJS) $(SCRIPT_OBJS) # # The default set of files for the dependency generators to work on # is just their source equivalents. -# +# ifneq "$(BootingFromHc)" "YES" MKDEPENDHS_SRCS=$(HS_SRCS) @@ -154,7 +168,7 @@ else MKDEPENDHS_SRCS= endif -MKDEPENDC_SRCS=$(C_SRCS) +MKDEPENDC_SRCS=$(C_SRCS) #------------------------------------------------------------------ # @@ -162,7 +176,7 @@ MKDEPENDC_SRCS=$(C_SRCS) # # The default set of files for the dependency generators to work on # is just their source equivalents. -# +# TAGS_HS_SRCS=$(HS_SRCS) TAGS_C_SRCS=$(C_SRCS) @@ -170,7 +184,7 @@ TAGS_C_SRCS=$(C_SRCS) # Clean file make-variables. # # The following three variables are used to control -# what gets removed when doing `make clean' +# what gets removed when doing `make clean' # # MOSTLYCLEAN_FILES object code etc., but not stuff # that is slow to recompile and/or stable @@ -181,12 +195,10 @@ TAGS_C_SRCS=$(C_SRCS) # that may require extra tools to create. # # -MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) +MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS) CLEAN_FILES += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \ $(PROG) $(LIBRARY) $(HS_IFACES) $(HS_SS) a.out \ - $(patsubst %.hsc,%.hs,$(HSC_SRCS)) \ - $(patsubst %.hsc,%_hsc.c,$(HSC_SRCS)) \ - $(patsubst %.hsc,%_hsc.h,$(HSC_SRCS)) + $(DERIVED_SRCS) # Don't clean the .hc files if we're bootstrapping ifneq "$(BootingFromHc)" "YES" @@ -200,21 +212,21 @@ MAINTAINER_CLEAN_FILES += $(BOOT_SRCS) # `Standard' set of files to clean out. # MOSTLY_CLEAN_FILES += \ - *.CKP *.ln *.BAK *.bak .*.bak *.o *core a.out errs ,* *.a .emacs_* \ + *.CKP *.ln *.BAK *.bak .*.bak *.o core a.out errs ,* *.a .emacs_* \ tags TAGS *.ind *.ilg *.idx *.idx-prev *.aux *.aux-prev *.dvi *.log \ - *.toc *.lot *.lof *.blg *.cb *_stub.c *_stub.h *.raw_s + *.toc *.lot *.lof *.blg *.cb *_stub.c *_stub.h *.raw_s *.a.list #------------------------------------------------------------------ # # Distribution setup -# +# # Following variables are used for creating source and binary distributions: # # SRC_DIST_NAME && BIN_DIST_NAME -- the package names # # SRC_DIST_FILES = list of extra files to include from a build tree into a source # distribution -# +# # SRC_DIST_DIR = what the current directory in the source/build tree # maps to in the source distrib. tree being created. # @@ -235,7 +247,7 @@ SRC_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion) # # BIN_DIST_DIRS= at the toplevel, list of directories to descend into when # building the distribution tree. -# +# # An extra directory variable that is set during bin-dists is $(bindist_top), giving # the abs. path to the root of the binary installation tree. (useful when punting # stuff like README and ANNOUNCE into a distrib, for instance)