X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=a89f1b06ccbca8907d562854909774386b94a425;hb=33939049908879995854acac39c3c85e250d1f9a;hp=ce6406298aa5fc68b7f4f2b5c10e3c571193a6da;hpb=26396e5ed28e704d17239eb1ece7c866d491ee8d;p=ghc-hetmet.git diff --git a/mk/target.mk b/mk/target.mk index ce64062..a89f1b0 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -72,19 +72,13 @@ ifneq "$(MKDEPENDC_SRCS)" "" $(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS) endif ifneq "$(MKDEPENDHS_SRCS)" "" - @if ( echo $(notdir $(MKDEPENDHS)) | grep ghc >/dev/null 2>&1 ); then \ - echo $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) ; \ - $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) ; \ - else \ - echo $(MKDEPENDHS) -f .depend $(MKDEPENDHS_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(HC_OPTS) -- $(MKDEPENDHS_SRCS) ; \ - $(MKDEPENDHS) -f .depend $(MKDEPENDHS_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(HC_OPTS) -- $(MKDEPENDHS_SRCS) ; \ - fi + $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(MKDEPENDHS_OPTS) $(patsubst -odir,,$(HC_OPTS)) $(MKDEPENDHS_SRCS) endif -# -# The above decides whether to invoke the computation of dependencies -# the ghc-0.xx or the ghc-2.x way by looking for "ghc" in the name of -# of the `make depend' script. Not bulletproof this. -# + +# the above patsubst is a hack to remove the '-odir $*' from HC_OPTS +# which is present when we're splitting objects. The $* maps to +# nothing, since this isn't a pattern rule, so we have to get rid of +# the -odir too to avoid problems. ################################################################## # boot @@ -413,6 +407,16 @@ endif @echo Done. endif +# links to script programs: we sometimes install a script as +# - with a link from to the real script. + +ifneq "$(SCRIPT_LINK)" "" +all :: $(SCRIPT_LINK) + +$(SCRIPT_LINK) : $(SCRIPT_PROG) + $(LN_S) $(SCRIPT_PROG) $(SCRIPT_LINK) +endif + ########################################### # @@ -484,7 +488,7 @@ ifneq "$(BIN_DIST)" "1" echo '$$'"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ echo '$$'"datadir='$(datadir)';" >> $$i.tmp ; \ cat $$i >> $$i.tmp ; \ - echo $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_OPTS)) $$i.tmp $(bindir)/$$i ; \ + echo $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ; \ $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ; \ $(RM) $$i.tmp; \ done @@ -625,6 +629,14 @@ install-strip:: @$(MAKE) EXTRA_INSTALL_OPTS='-s' install endif +# +# install links to script drivers. +# +ifneq "$(SCRIPT_LINK)" "" +install :: + $(LN_S) $(SCRIPT_PROG) $(bindir)/$(SCRIPT_LINK) +endif + ########################################### # # Targets: dist binary-dist @@ -691,31 +703,15 @@ dist-post:: ( cd $(SRC_DIST_DIR) ; cd .. ; find $(SRC_DIST_NAME) -type d -exec sh -c 'test x`ls $$0 | wc -l | sed -e "s/ //g"` = x0' {} \; -print -exec rm -rf {} \; -prune ) ( cd $(SRC_DIST_DIR) ; cd .. ; chmod -R a+rw $(SRC_DIST_NAME) ) +# Automatic generation of a MANIFEST file for a source distribution +# tree that is ready to go. +dist-manifest :: + cd $(SRC_DIST_DIR); find . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > /tmp/MANIFEST ; mv /tmp/MANIFEST MANIFEST + dist-package:: cd $(SRC_DIST_DIR); cd ..; $(TAR) chzf $(SRC_DIST_NAME).tar.gz $(SRC_DIST_NAME) # - - -# The default dist rule: -# -# copy/link the contents of $(SRC_DIST_FILES) into the -# shadow distribution tree. SRC_DIST_FILES contain the -# build-generated files that you want to include in -# a source distribution. -# -# -ifneq "$(SRC_DIST_FILES)" "" -dist:: - @for i in $(SRC_DIST_FILES); do \ - if (test -f "$$i"); then \ - echo $(LN_S) `pwd`/$$i $(SRC_DIST_DIR)/$$i ; \ - $(LN_S) `pwd`/$$i $(SRC_DIST_DIR)/$$i ; \ - fi; \ - done; -endif - -# # binary-dist creates a binary bundle, set BIN_DIST_NAME # to package name and do `make binary-dist' (normally this # just a thing you would do from the toplevel of fptools or) @@ -727,7 +723,7 @@ binary-dist-pre:: -rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) -rm -f $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz @for i in $(BIN_DIST_DIRS); do \ - if (test -d "$$i"); then \ + if test -d "$$i"; then \ echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \ $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \ echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \ @@ -790,18 +786,18 @@ check:: $(TESTS) #------------------------------------------------------------ # Tags -.PHONY: TAGS +.PHONY: TAGS tags -TAGS:: $(SOURCES) +tags TAGS:: $(TAGS_HS_SRCS) $(TAGS_C_SRCS) @$(RM) TAGS @touch TAGS -ifneq "$(HS_SRCS)" "" +ifneq "$(TAGS_HS_SRCS)" "" $(HSTAGS) $(HSTAGS_OPTS) -- $(TAGS_HS_SRCS) endif -ifneq "$(C_SRCS)" "" +ifneq "$(TAGS_C_SRCS)" "" etags -a $(TAGS_C_SRCS) endif - @( DEREFFED=`ls -l Makefile | sed -e 's/.*-> \(.*\)/\1/g'` && $(RM) `dirname $$DEREFFED`/TAGS && $(CP) TAGS `dirname $$DEREFFED` ) || echo TAGS file generated, perhaps copy over to source tree? + @( DEREFFED=`ls -l Makefile | sed -e 's/.*-> \(.*\)/\1/g'` && $(RM) `dirname $$DEREFFED`/TAGS && $(CP) TAGS `dirname $$DEREFFED` ) 2>/dev/null || echo TAGS file generated, perhaps copy over to source tree? #------------------------------------------------------------ # Makefile debugging @@ -812,86 +808,50 @@ endif show: @echo '$(VALUE)=$($(VALUE))' -#------------------------------------------------------------ -# Documentation - +#-------------------------------------------------------------------------- +# SGML Documentation +# .PHONY: dvi ps html info txt -info:: $(DOC_INFO) -dvi:: $(DOC_DVI) -ps:: $(DOC_PS) -html:: $(DOC_HTML) -texi:: $(DOC_TEXI) -txt:: $(DOC_TEXT) - -# -# Building literate root documents requires extra treatment, -# as the root files need to be processed different from other -# literate files (`compile' them into .itex with the -S (standalone) -# option) and then link together a master TeX document with -# a -S option. -# -$(filter %.tex,$(patsubst %.lit,%.tex,$(DOC_SRCS))) : - @$(RM) $@ - $(LIT2LATEX) -S -c $(LIT2LATEX_OPTS) -o $(patsubst %.tex,%.itex,$@) $(addsuffix .lit,$(basename $@)) - $(LIT2LATEX) -S $(LIT2LATEX_OPTS) -o $@ $(addsuffix .itex,$(basename $@)) - @chmod 444 $@ -# -# Ditto for texi and html -# -$(filter %.texi,$(patsubst %.lit,%.texi,$(DOC_SRCS))) : - @$(RM) $@ - $(LIT2TEXI) -S -c $(LIT2TEXI_OPTS) -o $(patsubst %.texi,%.itxi,$@) $(addsuffix .lit,$(basename $@)) - $(LIT2TEXI) -S $(LIT2TEXI_OPTS) -o $@ $(addsuffix .itxi,$(basename $@)) - @chmod 444 $@ -# -# Rather than using lit2html, we opt for the lit-texi-html route, -# and use texi2html as our HTML backend. -# (Note: we need to change mkdependlit to get this really off the ground) -# -# If the generated html representation is split up into a myriad of files, -# put the files in a subdirectory html/, if a monolith is created, park -# the generated file in the same dir as the .lit file. -# -$(filter %.html,$(patsubst %.lit,%.html,$(DOC_SRCS))) : $(filter %.lit,$(DOC_SRCS)) - $(RM) $@ $(patsubst %.html,%.texi,$@) $(patsubst %.html,%.itxi,$@) -ifneq "$(filter -monolithic,$(TEXI2HTML_OPTS))" "" - $(LIT2TEXI) -S -c $(LIT2TEXI_OPTS) -o $(patsubst %.html,%.itxi,$@) $(addsuffix .lit,$(basename $@)) - $(LIT2TEXI) -S $(LIT2TEXI_OPTS) -o $(patsubst %.html,%.texi,$@) $(addsuffix .itxi,$(basename $@)) - $(TEXI2HTML) $(TEXI2HTML_OPTS) $(patsubst %.html,%.texi,$@) - cp $(TEXI2HTML_PREFIX)invisible.xbm . +ifneq "$(SGML_DOC)" "" + +# multi-file SGML document: main document name is specified in $(SGML_DOC), +# sub-documents (.sgml files) listed in $(SGML_SRCS). + +$(SGML_DOC).sgml : $(SGML_SRCS) + cat $(SGML_SRCS) > $(SGML_DOC).sgml + +SGML_DVI = $(SGML_DOC).dvi +SGML_PS = $(SGML_DOC).ps +SGML_INFO = $(SGML_DOC).info +SGML_HTML = $(SGML_DOC).html +SGML_TEXT = $(SGML_DOC).txt + +else # no SGML_DOC + +VSGML_SRCS = $(wildcard *.vsgml) + +ifneq "$(VSGML_SRCS)" "" +SGML_SRCS = $(addsuffix .sgml, $(basename $(VSGML_SRCS))) else - $(RM) html/$(basename $@)* - $(MKDIRHIER) html - $(LIT2TEXI) -S -c $(LIT2TEXI_OPTS) -o $(patsubst %.html,%.itxi,$@) $(addsuffix .lit,$(basename $@)) - $(LIT2TEXI) -S $(LIT2TEXI_OPTS) -o html/$(patsubst %.html,%.texi,$@) $(addsuffix .itxi,$(basename $@)) - (cd html; ../$(TEXI2HTML) $(TEXI2HTML_OPTS) $(patsubst %.html,%.texi,$@); cd ..) - cp $(TEXI2HTML_PREFIX)invisible.xbm html/ - @touch $@ +SGML_SRCS = $(wildcard *.sgml) endif -#-------------------------------------------------------------------------- -# SGML Documentation -# -# This will eventually replace the literate stuff for documentation - -SGML_SRCS = $(wildcard *.sgml *.vsgml) SGML_DVI = $(addsuffix .dvi, $(basename $(SGML_SRCS))) SGML_PS = $(addsuffix .ps, $(basename $(SGML_SRCS))) -SGML_TEXI = $(addsuffix .texi, $(basename $(SGML_SRCS))) SGML_INFO = $(addsuffix .info, $(basename $(SGML_SRCS))) SGML_HTML = $(addsuffix .html, $(basename $(SGML_SRCS))) SGML_TEXT = $(addsuffix .txt, $(basename $(SGML_SRCS))) +endif # SGML_DOC + dvi :: $(SGML_DVI) info :: $(SGML_INFO) html :: $(SGML_HTML) txt :: $(SGML_TXT) ps :: $(SGML_PS) -CLEAN_FILES += $(SGML_TEXT) $(SGML_HTML) $(SGML_TEXI) $(SGML_PS) $(SGML_DVI) - -# suffix rules should handle the rest (for single-file docs at least). +CLEAN_FILES += $(SGML_TEXT) $(SGML_HTML) $(SGML_PS) $(SGML_DVI) ########################################### # @@ -1039,6 +999,10 @@ endif # if way # 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" ifeq "$(way)" "" ifneq "$(SUBDIRS)" "" @@ -1048,13 +1012,15 @@ all docs runtests boot TAGS clean veryclean maintainer-clean install info :: @echo "===fptools== Recursively making \`$@' in $(SUBDIRS) ..." @echo "PWD = $(shell pwd)" @echo "------------------------------------------------------------------------" - @case '${MFLAGS}' in *-[ik]*) set +e;; *) set -e;; esac; \ - for i in $(SUBDIRS) ; do \ +# 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) $@;"; \ + 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) ..." @@ -1062,14 +1028,40 @@ all docs runtests boot TAGS clean veryclean maintainer-clean install info :: @echo "------------------------------------------------------------------------" dist :: - @case '${MFLAGS}' in *-[ik]*) set +e;; *) set -e;; esac; \ +# 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 \ $(MKDIRHIER_PREFIX)mkdirhier $(SRC_DIST_DIR)/$$i; \ $(MAKE) -C $$i $(MFLAGS) $@ SRC_DIST_DIR=$(SRC_DIST_DIR)/$$i; \ + if [ $$? -eq 0 ] ; then true; else exit $$x_on_err; fi; \ done endif endif +# The default dist rule: +# +# copy/link the contents of $(SRC_DIST_FILES) into the +# shadow distribution tree. SRC_DIST_FILES contain the +# build-generated files that you want to include in +# a source distribution. +# +# +ifneq "$(SRC_DIST_FILES)" "" +dist:: + @for i in $(SRC_DIST_FILES); do \ + if ( echo "$$i" | grep "~" >/dev/null 2>&1 ); then \ + echo $(LN_S) `pwd`/`echo $$i | sed -e "s/^\([^~]*\)~.*/\1/g"` $(SRC_DIST_DIR)/`echo $$i | sed -e "s/.*~\(.*\)/\1/g"` ; \ + $(LN_S) `pwd`/`echo $$i | sed -e "s/^\([^~]*\)~.*/\1/g"` $(SRC_DIST_DIR)/`echo $$i | sed -e "s/.*~\(.*\)/\1/g"` ; \ + else \ + if (test -f "$$i"); then \ + echo $(LN_S) `pwd`/$$i $(SRC_DIST_DIR)/$$i ; \ + $(LN_S) `pwd`/$$i $(SRC_DIST_DIR)/$$i ; \ + fi; \ + fi; \ + done; +endif + + # # Selectively building subdirectories. # @@ -1083,20 +1075,22 @@ ifneq "$(WAYS)" "" ifeq "$(way)" "" # NB: the targets exclude -# boot info TAGS +# boot info TAGS runtests # since these are way-independent -all docs runtests TAGS clean veryclean maintainer-clean install :: +all docs TAGS clean veryclean maintainer-clean install :: @echo "------------------------------------------------------------------------" @echo "===fptools== Recursively making \`$@' for ways: $(WAYS) ..." @echo "PWD = $(shell pwd)" @echo "------------------------------------------------------------------------" - @case '${MFLAGS}' in *-[ik]*) set +e;; *) set -e;; esac; \ +# 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 $(WAYS) ; do \ echo "------------------------------------------------------------------------"; \ echo "==fptools== $(MAKE) way=$$i $@;"; \ echo "PWD = $(shell pwd)"; \ echo "------------------------------------------------------------------------"; \ $(MAKE) way=$$i --no-print-directory $(MFLAGS) $@ ; \ + if [ $$? -eq 0 ] ; then true; else exit $$x_on_err; fi; \ done @echo "------------------------------------------------------------------------" @echo "===fptools== Finished recursively making \`$@' for ways: $(WAYS) ..."