X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=b0fce7c9ee68c4884a6545da4704d86dceec99ac;hb=2f1889c3bdccc3b02d1741aeb4c0493434b12309;hp=fd0502b67a0363dd5a61f5bb02304978e051b14b;hpb=d1bf2fc3a836c3818eba63d1890c65ee0a7d61bd;p=ghc-hetmet.git diff --git a/mk/target.mk b/mk/target.mk index fd0502b..b0fce7c 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -16,6 +16,7 @@ # 2. GNU standard targets # all* # install* uninstall installcheck installdirs +# install-docs* # clean* distclean* mostlyclean* maintainer-clean* # tags* # dvi ps (no info) FPTOOLS adds: pdf rtf html @@ -32,104 +33,21 @@ # # - -################################################################## -# -# Recursive stuff -# -# At the top of the file so that recursive makes happen before -# makes in the main directory. This is needed for some targets, -# e.g. when building DLLs in hslibs. -# ################################################################## +# Pre-compute the list of sources so we don't have to do this +# multiple times. See paths.mk. -# Here are the diabolically clever rules that -# -# (a) for each "recursive target" -# propagates "make " to directories in SUBDIRS -# -# (b) when SUBDIRS is empty, -# for each "multi-way-target" -# calls "make way=w " for each w in $(WAYS) -# -# This has the effect of making the standard target -# in each of the specified ways (as well as in the normal way - -# Controlling variables -# WAYS = extra (beyond the normal way) ways to build things in -# SUBDIRS = subdirectories to recurse into - -# No ways, so iterate over the SUBDIRS - -# note about recursively invoking make: we'd like make to drop all the -# way back to the top level if it fails in any of the -# sub(sub-...)directories. This is done by setting the -e flag to the -# shell during the loop, which causes an immediate failure if any of -# the shell commands fail. - -# One exception: if the user gave the -i or -k flag to make in the -# first place, we'd like to reverse this behaviour. So we check for -# these flags, and set the -e flag appropriately. NOTE: watch out for -# the --no-print-directory flag which is passed to recursive -# invocations of make. -# -# NOTE: Truly weird use of exit below to stop the for loop dead in -# its tracks should any of the sub-makes fail. By my reckoning, -# "cmd || exit $?" should be equivalent to "cmd" - -ifneq "$(SUBDIRS)" "" - -# we override the 'boot', 'all' and 'install' targets in the top -# level Makefile. Some of the sub-projects also set 'boot' to empty. - -ifeq "$(NO_ALL_TARGET)" "YES" -ALL_TARGET = -else -ALL_TARGET = all -endif +PRE_SRCS := $(ALL_SRCS) -ifeq "$(NO_BOOT_TARGET)" "YES" -BOOT_TARGET = -else -BOOT_TARGET = boot -endif - -ifeq "$(NO_INSTALL_TARGET)" "YES" -INSTALL_TARGET = -else -INSTALL_TARGET = install -endif +################################################################## +# Include package building machinery -$(ALL_TARGET) docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $(INSTALL_TARGET) html ps dvi txt:: - @echo "------------------------------------------------------------------------" - @echo "===fptools== Recursively making \`$@' in $(SUBDIRS) ..." - @echo "PWD = $(shell pwd)" - @echo "------------------------------------------------------------------------" -# Don't rely on -e working, instead we check exit return codes from sub-makes. - @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ - for i in $(SUBDIRS); do \ - echo "------------------------------------------------------------------------"; \ - echo "==fptools== $(MAKE) $@ $(MFLAGS);"; \ - echo " in $(shell pwd)/$$i"; \ - echo "------------------------------------------------------------------------"; \ - $(MAKE) --no-print-directory -C $$i $(MFLAGS) $@; \ - if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ - done - @echo "------------------------------------------------------------------------" - @echo "===fptools== Finished making \`$@' in $(SUBDIRS) ..." - @echo "PWD = $(shell pwd)" - @echo "------------------------------------------------------------------------" +include $(TOP)/mk/package.mk -endif +################################################################### +# Suffix rules for Haskell, C and literate -# -# Selectively building subdirectories. -# -# -ifneq "$(SUBDIRS)" "" -$(SUBDIRS) :: - $(MAKE) -C $@ $(MFLAGS) -endif +include $(TOP)/mk/suffix.mk ################################################################## # FPtools standard targets @@ -159,7 +77,13 @@ endif # Compiler produced files that are targets of the source's imports. MKDEPENDHS_OBJ_SUFFICES=o -depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) +ifneq "$(STAMP_PKG_CONF)" "" +PKGCONF_DEP = $(STAMP_PKG_CONF) +else +PKGCONF_DEP = +endif + +depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(STAMP_PKG_CONF) @$(RM) .depend @touch .depend ifneq "$(DOC_SRCS)" "" @@ -256,7 +180,7 @@ endif # `TAGS' # Update a tags table for this program. # -# `dvi' `ps' `pdf' `html' `pdf' +# `dvi' `ps' `pdf' `html' `rtf' # Generate DVI/PS/PDF files for LaTeX/DocBook docs. Not everything is # supported everywhere, but the intention is to standardise on DocBook # producing all formats. @@ -319,9 +243,6 @@ else $(HS_PROG) :: $(HS_OBJS) $(CC) -o $@ $(HC_BOOT_CC_OPTS) $(HC_BOOT_LD_OPTS) $(HS_OBJS) $(HC_BOOT_LIBS) endif - -# for building a Haskell program, we add FptoolsHcOpts -SRC_HC_OPTS += $(FptoolsHcOpts) endif #---------------------------------------- @@ -334,68 +255,6 @@ $(C_PROG) :: $(C_OBJS) $(CC) -o $@ $(CC_OPTS) $(LD_OPTS) $(C_OBJS) $(LIBS) endif - -#---------------------------------------- -# Building HsLibs libraries. -# -# Inputs: -# $(PACKAGE) is the name of the library to build -# $(IS_CBITS_LIB) should be "YES" for a "cbits" library -# -# Outputs: -# $(LIBRARY) the name of the library.a -# $(GHIC_LIBRARY) the name of the library.o (for GHCi) -# $(LIBOBJS) objects to put in library -# $(STUBOBJS) more objects to put in library -# -# $(LIBOBJS) is set to $(HS_OBJS) or $(C_OBJS) depending -# on whether or not it's a "cbits" library. But you can -# override this by setting $(LIBOBJS) yourself - -ifneq "$(PACKAGE)" "" - -# add syslib dependencies and current package name -SRC_HC_OPTS += -package-name $(PACKAGE) -SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS)) - -ifeq "$(IS_CBITS_LIB)" "YES" -_cbits := _cbits -STUBOBJS += $(HSC_C_OBJS) -# Add _hsc.c files to the cbits library -C_SRCS += $(wildcard ../*_hsc.c) -# Make .hsc.h include files from the directory above visible -# (and the cbits/ library too). -SRC_CC_OPTS += -I.. -I. -endif - -ifneq "$(way)" "i" -LIBRARY = libHS$(PACKAGE)$(_cbits)$(_way).a -GHCI_LIBRARY = HS$(PACKAGE)$(_cbits)$(_way).o -else -LIBRARY = $(PACKAGE).dll -endif - -ifneq "$(IS_CBITS_LIB)" "YES" -WAYS=$(GhcLibWays) -endif - -ifeq "$(LIBOBJS)" "" - ifeq "$(IS_CBITS_LIB)" "YES" - LIBOBJS = $(C_OBJS) - else - LIBOBJS = $(HS_OBJS) - endif -endif - -ifeq "$(IS_CBITS_LIB)" "YES" -override datadir:=$(libdir)/include -INSTALL_DATAS += Hs$(shell perl -e 'print ucfirst "$(PACKAGE)"').h -else -SRC_CC_OPTS += -Icbits -endif - -endif # PACKAGE - #---------------------------------------- # Libraries/archives # @@ -439,17 +298,22 @@ ifneq "$(way)" "u" SRC_HC_OPTS += -split-objs +# We generate the archive into a temporary file libfoo.a.tmp, then +# rename it at the end. This avoids the problem that ar may sometimes +# fail, leaving a partially built archive behind. ifeq "$(ArSupportsInput)" "" define BUILD_LIB -$(RM) $@ -(echo $(STUBOBJS); $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o') | xargs ar q $@ +$(RM) $@ $@.tmp +(echo $(STUBOBJS) $(C_OBJS) $(GC_C_OBJS); $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' -print) | xargs $(AR) $@ $(RANLIB) $@ endef else define BUILD_LIB -$(RM) $@ +$(RM) $@ $@.tmp echo $(STUBOBJS) > $@.list -$(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o' >> $@.list +echo $(C_OBJS) >> $@.list +echo $(GC_C_OBJS) >> $@.list +$(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' -print >> $@.list $(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list $(RM) $@.list $(RANLIB) $@ @@ -459,10 +323,10 @@ endif # Extra stuff for compiling Haskell files with $(SplitObjs): HC_SPLIT_PRE = \ - $(RM) $@; if [ ! -d $(basename $@) ]; then mkdir $(basename $@); else \ - $(FIND) $(basename $@) -name '*.$(way_)o' | xargs $(RM) __rm_food; fi + $(RM) $@; if [ ! -d $(basename $@)_split ]; then mkdir $(basename $@)_split; else \ + $(FIND) $(basename $@)_split -name '*.$(way_)o' -print | xargs $(RM) __rm_food; fi ifeq "$(GhcWithInterpreter)" "YES" -HC_SPLIT_POST = $(LD) -r -x -o $@ $(basename $@)/*.$(way_)o +HC_SPLIT_POST = (cd $(dir $@) && $(LD) -r $(LD_X) -o $(notdir $@) $(basename $(notdir $@))_split/*.$(way_)o) else HC_SPLIT_POST = touch $@ endif # GhcWithInterpreter == YES @@ -477,8 +341,8 @@ SRC_HC_POST_OPTS += $(HC_SPLIT_POST); # extraclean :: - $(FIND) $(patsubst %.$(way_)o,%,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food - -rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS)) > /dev/null 2>&1 + $(FIND) $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food + -rmdir $(patsubst %.$(way_)o,%_split,$(HS_OBJS)) > /dev/null 2>&1 endif # $(way) == u endif # $(SplitObjs) @@ -491,62 +355,23 @@ endif # $(HS_SRCS) ifeq "$(StripLibraries)" "YES" ifeq "$(SplitObjs)" "YES" SRC_HC_POST_OPTS += \ - for i in $(basename $@)/*; do \ - $(LD) -r -x -o $$i.tmp $$i; \ + for i in $(basename $@)_split/*; do \ + $(LD) -r $(LD_X) -o $$i.tmp $$i; \ $(MV) $$i.tmp $$i; \ done else SRC_HC_POST_OPTS += \ - $(LD) -r -x -o $@.tmp $@; $(MV) $@.tmp $@ + $(LD) -r $(LD_X) -o $@.tmp $@; $(MV) $@.tmp $@ endif # SplitObjs endif # StripLibraries -$(LIBRARY) :: $(STUBOBJS) $(LIBOBJS) +# Note: $(STUBOBJS) isn't depended on here, but included when building the lib. +# (i.e., the assumption is that $(STUBOBJS) are created as a side-effect +# of building $(LIBOBJS)). +$(LIBRARY) : $(LIBOBJS) $(BUILD_LIB) endif # LIBRARY = "" -#-------------------------------------------------------------- -# Build dynamically-linkable libraries for GHCi -# -# Build $(GHCI_LIBRARY) from $(LIBOBJS)+$(STUBOBJS) -# -# Why? GHCi can only link .o files (at the moment), not .a files -# so we have to build libFoo.o as well as libFoo.a -# -# Furthermore, GHCi currently never loads -# profiling libraries (or other non-std ways) -# -# Inputs: -# $(GHCI_LIBRARY) -# -# Outputs: -# Rule to build $(GHCI_LIBRARY) - - -ifneq "$(GHCI_LIBRARY)" "" -ifeq "$(way)" "" -ifeq "$(GhcWithInterpreter)" "YES" - - -INSTALL_LIBS += $(GHCI_LIBRARY) -CLEAN_FILES += $(GHCI_LIBRARY) - -all :: $(GHCI_LIBRARY) - -ifneq "$(DONT_WANT_STD_GHCI_LIB_RULE)" "YES" -# If you don't want to build GHCI_LIBRARY the 'standard' way, -# set DONT_WANT_STD_GHCI_LIB_RULE to YES. The Prelude and -# hslibs/Win32 uses this 'feature'. -# -$(GHCI_LIBRARY) :: $(LIBOBJS) - $(LD) -r -x -o $@ $(LIBOBJS) $(STUBOBJS) - -endif # DONT_WANT_STD_GHCI_LIB_RULE -endif # GhcWithInterpreter -endif # way -endif # GHCI_LIBRARY != "" - - #---------------------------------------- # Building Win32 DLLs # @@ -799,11 +624,11 @@ $(LINK) : $(LINK_TARGET) install :: @$(INSTALL_DIR) $(bindir) @if ( $(PERL) -e '$$fn="$(bindir)/$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \ - echo "Creating a symbol link from $(LINK_TARGET) to $(LINK) in $(bindir)"; \ + echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK) in $(bindir)"; \ $(RM) $(bindir)/$(LINK); \ $(LN_S) $(LINK_TARGET) $(bindir)/$(LINK); \ else \ - echo "Creating a symbol link from $(LINK_TARGET) to $(LINK) in $(bindir) failed: \`$(bindir)/$(LINK)' already exists"; \ + echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK) in $(bindir) failed: \`$(bindir)/$(LINK)' already exists"; \ echo "Perhaps remove \`$(bindir)/$(LINK)' manually?"; \ exit 1; \ fi; @@ -826,6 +651,7 @@ endif # LINK # INSTALL_LIB_SCRIPTS platform-dependent scripts in $(libdir) # INSTALL_LIBEXECS platform-dependent execs in $(libdir) # INSTALL_DATAS platform-independent files in $(datadir) +# INSTALL_IFACES platform-dependent interface files in $(ifacedir) # # If the installation directory variable is undefined, the install rule simply # emits a suitable error message. @@ -834,7 +660,7 @@ endif # LINK # friends can be overridden from their original settings in mk/config.mk.in # || mk/build.mk # -.PHONY: install installdirs install-strip install-dirs uninstall install-docs show-install +.PHONY: install install-docs installdirs install-strip install-dirs uninstall install-docs show-install show-install : @echo "bindir = $(bindir)" @@ -857,16 +683,6 @@ install-dirs :: # within the various install targets instead. #install:: install-dirs -# Install libraries automatically -ifneq "$(LIBRARY)" "" -INSTALL_LIBS += $(LIBRARY) -ifeq "$(DLLized)" "YES" -INSTALL_PROGS += $(DLL_NAME) -INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY)) -endif -INSTALL_DATAS += $(HS_IFACES) -endif - ifneq "$(INSTALL_PROGS)" "" # @@ -878,13 +694,7 @@ ifneq "$(INSTALL_PROGS)" "" # entry in the INSTALL_PROGS list. If there's no suffix, use # $(exeext). # -# This is bit of a pain to express since GNU make doesn't have -# something like $(if ...), but possible using $(subst ...) -# [Aside: I added support for $(if ...) to my local copy of GNU -# make at one stage, perhaps I should propagate the patch to -# the GNU make maintainers...] -# -INSTALL_PROGS := $(foreach p, $(INSTALL_PROGS), $(addsuffix $(subst _,,$(subst __,$(exeext),_$(suffix $(p))_)), $(basename $(p)))) +INSTALL_PROGS := $(foreach p, $(INSTALL_PROGS), $(addsuffix $(if $(suffix $(p)),,$(exeext)), $(basename $(p)))) install:: $(INSTALL_PROGS) @$(INSTALL_DIR) $(bindir) @@ -932,6 +742,8 @@ install:: $(INSTALL_LIBS) $(RANLIB) $(libdir)/`basename $$i` ;; \ *.dll) \ $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(libdir) ;; \ + *.so) \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(libdir) ;; \ *) \ $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \ esac; \ @@ -960,6 +772,22 @@ install:: $(INSTALL_DATAS) done endif +ifneq "$(INSTALL_IFACES)" "" +install:: $(INSTALL_IFACES) + @$(INSTALL_DIR) $(ifacedir) + for i in $(INSTALL_IFACES); do \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(ifacedir); \ + done +endif + +ifneq "$(INSTALL_IFACES_WITH_DIRS)" "" +install:: $(INSTALL_IFACES_WITH_DIRS) + @$(INSTALL_DIR) $(ifacedir) + for i in $(INSTALL_IFACES_WITH_DIRS); do \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(ifacedir)/`dirname $$i`; \ + done +endif + ifneq "$(INSTALL_INCLUDES)" "" install:: $(INSTALL_INCLUDES) @$(INSTALL_DIR) $(includedir) @@ -968,6 +796,31 @@ install:: $(INSTALL_INCLUDES) done endif +ifneq "$(INSTALL_DOCS)" "" +install-docs:: $(INSTALL_DOCS) + @$(INSTALL_DIR) $(datadir) + for i in $(INSTALL_DOCS); do \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \ + done +endif + +ifneq "$(INSTALL_SGML_DOC)" "" +ifneq "$(SGMLDocWays)" "" +install-docs:: $(foreach i,$(SGMLDocWays),$(INSTALL_SGML_DOC).$i) + @$(INSTALL_DIR) $(datadir) + @for i in $(SGMLDocWays); do \ + if [ $$i = "html" ]; then \ + $(INSTALL_DIR) $(datadir)/html; \ + echo $(CP) -r $(INSTALL_SGML_DOC) $(datadir)/html; \ + $(CP) -r $(INSTALL_SGML_DOC) $(datadir)/html; \ + else \ + echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(datadir); \ + $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_SGML_DOC).$$i $(datadir); \ + fi \ + done +endif +endif + # # Use with care.. # @@ -1033,7 +886,7 @@ tags TAGS:: $(TAGS_HS_SRCS) $(TAGS_C_SRCS) @$(RM) TAGS @touch TAGS ifneq "$(TAGS_HS_SRCS)" "" - $(HSTAGS) $(HSTAGS_OPTS) -- $(TAGS_HS_SRCS) + $(HSTAGS) $(HSTAGS_OPTS) $(TAGS_HS_SRCS) endif ifneq "$(TAGS_C_SRCS)" "" etags -a $(TAGS_C_SRCS) @@ -1059,6 +912,8 @@ show: ifneq "$(SGML_DOC)" "" +all :: $(SGMLDocWays) + # multi-file SGML document: main document name is specified in $(SGML_DOC), # sub-documents (.sgml files) listed in $(SGML_SRCS). @@ -1219,3 +1074,106 @@ all docs TAGS clean distclean mostlyclean maintainer-clean install :: endif endif + + +################################################################## +# +# Recursive stuff +# +# This was once at the top of the file, allegedly because it was +# needed for some targets, e.g. when building DLLs in libraries. But +# since this reason is a little short on information, and I'm having +# trouble with subdirectory builds happening before the current +# directory when building hslibs (bad interaction with including +# _hsc.o files in the cbits lib) so I'm moving the recursive makes to +# the end --SDM 12/12/2001 +# +################################################################## + +# Here are the diabolically clever rules that +# +# (a) for each "recursive target" +# propagates "make " to directories in SUBDIRS +# +# (b) when SUBDIRS is empty, +# for each "multi-way-target" +# calls "make way=w " for each w in $(WAYS) +# +# This has the effect of making the standard target +# in each of the specified ways (as well as in the normal way + +# Controlling variables +# WAYS = extra (beyond the normal way) ways to build things in +# SUBDIRS = subdirectories to recurse into + +# No ways, so iterate over the SUBDIRS + +# note about recursively invoking make: we'd like make to drop all the +# way back to the top level if it fails in any of the +# sub(sub-...)directories. This is done by setting the -e flag to the +# shell during the loop, which causes an immediate failure if any of +# the shell commands fail. + +# One exception: if the user gave the -i or -k flag to make in the +# first place, we'd like to reverse this behaviour. So we check for +# these flags, and set the -e flag appropriately. NOTE: watch out for +# the --no-print-directory flag which is passed to recursive +# invocations of make. +# +#ifeq "$(way)" "" +ifneq "$(SUBDIRS)" "" + +# we override the 'boot', 'all' and 'install' targets in the top +# level Makefile. Some of the sub-projects also set 'boot' to empty. + +ifeq "$(NO_ALL_TARGET)" "YES" +ALL_TARGET = +else +ALL_TARGET = all +endif + +ifeq "$(NO_BOOT_TARGET)" "YES" +BOOT_TARGET = +else +BOOT_TARGET = boot +endif + +ifeq "$(NO_INSTALL_TARGET)" "YES" +INSTALL_TARGET = +INSTALL_DOCS_TARGET = +else +INSTALL_TARGET = install +INSTALL_DOCS_TARGET = install-docs +endif + +$(ALL_TARGET) docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $(INSTALL_TARGET) $(INSTALL_DOCS_TARGET) html ps dvi txt:: + @echo "------------------------------------------------------------------------" + @echo "===fptools== Recursively making \`$@' in $(SUBDIRS) ..." + @echo "PWD = $(shell pwd)" + @echo "------------------------------------------------------------------------" +# Don't rely on -e working, instead we check exit return codes from sub-makes. + @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ + for i in $(SUBDIRS); do \ + echo "------------------------------------------------------------------------"; \ + echo "==fptools== $(MAKE) $@ $(MFLAGS);"; \ + echo " in $(shell pwd)/$$i"; \ + echo "------------------------------------------------------------------------"; \ + $(MAKE) --no-print-directory -C $$i $(MFLAGS) $@; \ + if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ + done + @echo "------------------------------------------------------------------------" + @echo "===fptools== Finished making \`$@' in $(SUBDIRS) ..." + @echo "PWD = $(shell pwd)" + @echo "------------------------------------------------------------------------" + +endif +#endif + +# +# Selectively building subdirectories. +# +# +ifneq "$(SUBDIRS)" "" +$(SUBDIRS) :: + $(MAKE) -C $@ $(MFLAGS) +endif