X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=39452e120827a452ad9ae4d80f8e8a60d2ace593;hb=3d404cdd55ec68101fe8d0dc6c7d222895fde9fb;hp=28b3d7ce7f2313b9d503d38f9c0e010322236c0b;hpb=1fb1ab5d53a09607e7f6d2450806760688396387;p=ghc-hetmet.git diff --git a/mk/target.mk b/mk/target.mk index 28b3d7c..39452e1 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -59,31 +59,32 @@ # .PHONY: depend -depend :: $(HS_SRCS) $(C_SRCS) +# Compiler produced files that are targets of the source's imports. +MKDEPENDHS_OBJ_SUFFICES=o + +depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) @$(RM) .depend @touch .depend ifneq "$(DOC_SRCS)" "" $(MKDEPENDLIT) -o .depend $(MKDEPENDLIT_OPTS) $(filter %.lit,$(DOC_SRCS)) endif -ifneq "$(C_SRCS)" "" - $(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(C_SRCS) $(MKDEPENDC_SRCS) -endif -ifneq "$(HS_SRCS)" "" -ifeq ($(notdir $(MKDEPENDHS)),ghc) -# New way of doing dependencies: the ghc driver knows how - $(MKDEPENDHS) -M -optdep-f -optdep.depend \ - $(foreach way,$(WAYS),-optdep-s -optdep$(way)) \ - $(MKDEPENDHS_OPTS) \ - $(HC_OPTS) \ - $(HS_SRCS) -else -# Old way: call mkdependHS-1.2 - $(MKDEPENDHS) -f .depend $(MKDEPENDHS_OPTS) \ - $(foreach way,$(WAYS),-s $(way)) \ - -- $(HC_OPTS) -- $(HS_SRCS) $(MKDEPENDHS_SRCS) +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 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. +# ################################################################## # boot @@ -253,8 +254,8 @@ boot :: depend # directories where files are installed, and their parent # directories. There is a script called `mkinstalldirs' which is # convenient for this; find it in the Texinfo package. -# (FPTOOLS: we don't use the suggested script, but rather the -# mkdirhier script in glafp_utils -- SOF) +# (FPTOOLS: we use a close relative of the suggested script, situated +# in glafp-utils/mkdirhier -- SOF) @@ -373,24 +374,43 @@ ifneq "$(SCRIPT_PROG)" "" # # ToDo: make this work for shell scripts (drop the initial $). # +ifeq "$(INTERP)" "$(SHELL)" +SCRIPT_SUBST=$(foreach val,$(SCRIPT_SUBST_VARS),"echo \"$(val)=\\\"$($(val))\\\";\" >> $@;") +else SCRIPT_SUBST=$(foreach val,$(SCRIPT_SUBST_VARS),"echo \"$$\"\"$(val)=\\\"$($(val))\\\";\" >> $@;") +endif all :: $(SCRIPT_PROG) +# +# #! support under cygwin32 is not quite there yet, +# so we rely on the eval `trick' instead. On all other +# platforms, we prepend #!$(INTERP) -- SOF 6/97 +# + $(SCRIPT_PROG) :: $(SCRIPT_OBJS) $(RM) $@ @echo Creating $@... +ifeq "$(INTERP)" "perl" +ifneq "$(BIN_DIST)" "1" + echo "#! "$(PERL) > $@ +else + @touch $@ +endif +else ifneq "$(INTERP)" "" @echo "#!"$(INTERP) > $@ else @touch $@ endif +endif ifneq "$(SCRIPT_PREFIX_FILES)" "" @cat $(SCRIPT_PREFIX_FILES) >> $@ endif @eval $(SCRIPT_SUBST) @cat $(SCRIPT_OBJS) >> $@ @chmod a+x $@ + @echo Done. endif @@ -403,10 +423,11 @@ endif # For each of these variables that is defined, you # get one install rule # -# INSTALL_PROGS install these executable programs in $(bindir) -# INSTALL_LIBS install these platform-dependent libraries in $(libdir) -# INSTALL_LIBEXECS install these platform-dependent execs in $(libdir) -# INSTALL_DATAS install these platform-independent files in $(datadir) +# INSTALL_PROGS executable programs in $(bindir) +# INSTALL_SCRIPTS executable scripts in $(bindir) +# INSTALL_LIBS platform-dependent libraries in $(libdir) (ranlib'ed) +# INSTALL_LIBEXECS platform-dependent execs in $(libdir) +# INSTALL_DATAS platform-independent files in $(datadir) # # If the installation directory variable is undefined, the install rule simply # emits a suitable error message. @@ -415,39 +436,156 @@ endif # 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 +.PHONY: install installdirs install-strip install-dirs uninstall install-docs show-install + +show-install : + @echo "bindir = $(bindir)" + @echo "libdir = $(libdir)" + @echo "libexecdir = $(libexecdir) # by default, same as libdir" + @echo "datadir = $(datadir) # unused for ghc project" # # Sometimes useful to separate out the creation of install directories # from the installation itself. # -installdirs :: - $(INSTALL_DIR) $(bindir) - $(INSTALL_DIR) $(libdir) - $(INSTALL_DIR) $(libexecdir) - $(INSTALL_DIR) $(datadir) +install-dirs :: + @$(INSTALL_DIR) $(bindir) + @$(INSTALL_DIR) $(libdir) + @$(INSTALL_DIR) $(libexecdir) + @$(INSTALL_DIR) $(datadir) # Better do this first... -install:: installdirs +# but we won't for the moment, do it on-demand from +# within the various install targets instead. +#install:: install-dirs ifneq "$(INSTALL_PROGS)" "" install:: $(INSTALL_PROGS) - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $(INSTALL_PROGS) $(bindir) + @$(INSTALL_DIR) $(bindir) + for i in $(INSTALL_PROGS); do \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(bindir); \ + done +endif + +# +# Just like INSTALL_PROGS, but prefix with install sites bin/lib/data and +# install without stripping. +# +ifneq "$(INSTALL_SCRIPTS)" "" +install:: $(INSTALL_SCRIPTS) + @$(INSTALL_DIR) $(bindir) +ifeq "$(INTERP)" "perl" +ifneq "$(BIN_DIST)" "1" + @for i in $(INSTALL_SCRIPTS); do \ + $(RM) $$i.tmp; \ + echo "#! $(PERL)" > $$i.tmp ; \ + echo $$"bindir='$(bindir)';" >> $$i.tmp ; \ + echo $$"libdir='$(libdir)';" >> $$i.tmp ; \ + 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 ; \ + $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ; \ + $(RM) $$i.tmp; \ + done +else + for i in $(INSTALL_SCRIPTS); do \ + $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(bindir); \ + done +endif +else + for i in $(INSTALL_SCRIPTS); do \ + $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(bindir); \ + done +endif +endif + +ifneq "$(INSTALL_LIB_SCRIPTS)" "" +install:: $(INSTALL_LIB_SCRIPTS) + @$(INSTALL_DIR) $(libdir) +ifeq "$(INTERP)" "perl" +ifneq "$(BIN_DIST)" "1" + @for i in $(INSTALL_LIB_SCRIPTS); do \ + $(RM) $$i.tmp; \ + echo "#! $(PERL)" > $$i.tmp ; \ + echo $$"bindir='$(bindir)';" >> $$i.tmp ; \ + echo $$"libdir='$(libdir)';" >> $$i.tmp ; \ + echo $$"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ + echo $$"datadir='$(datadir)';" >> $$i.tmp ; \ + cat $$i >> $$i.tmp ; \ + echo $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libdir) ; \ + $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i.tmp $(libdir)/$$i ; \ + $(RM) $$i.tmp; \ + done +else + for i in $(INSTALL_LIB_SCRIPTS); do \ + $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libdir); \ + done +endif +else + for i in $(INSTALL_LIB_SCRIPTS); do \ + $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libdir); \ + done +endif +endif + +ifneq "$(INSTALL_LIBEXEC_SCRIPTS)" "" +install:: $(INSTALL_LIBEXEC_SCRIPTS) + @$(INSTALL_DIR) $(libexecdir) +ifeq "$(INTERP)" "perl" +ifneq "$(BIN_DIST)" "1" + @for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ + $(RM) $$i.tmp; \ + echo "#! $(PERL)" > $$i.tmp ; \ + echo $$"bindir='$(bindir)';" >> $$i.tmp ; \ + echo $$"libdir='$(libdir)';" >> $$i.tmp ; \ + echo $$"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ + echo $$"datadir='$(datadir)';" >> $$i.tmp ; \ + cat $$i >> $$i.tmp ; \ + echo $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libexecdir) ; \ + $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i.tmp $(libexecdir)/$$i ; \ + $(RM) $$i.tmp; \ + done +else + for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ + $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libexecdir); \ + done +endif +else + for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ + $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libexecdir); \ + done +endif endif ifneq "$(INSTALL_LIBS)" "" install:: $(INSTALL_LIBS) - $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_LIBS) $(libdir) + @$(INSTALL_DIR) $(libdir) + for i in $(INSTALL_LIBS); do \ + case $$i in \ + *.a) \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \ + $(RANLIB) $(libdir)/`basename $$i` ;; \ + *) \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \ + esac; \ + done endif ifneq "$(INSTALL_LIBEXECS)" "" install:: $(INSTALL_LIBEXECS) - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $(INSTALL_LIBEXECS) $(libexecdir) + @$(INSTALL_DIR) $(libexecdir) + -for i in $(INSTALL_LIBEXECS); do \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(libexecdir); \ + done endif ifneq "$(INSTALL_DATAS)" "" install:: $(INSTALL_DATAS) - $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_DATAS) $(datadir) + @$(INSTALL_DIR) $(datadir) + for i in $(INSTALL_DATAS); do \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \ + done endif # @@ -513,7 +651,7 @@ endif # # does not expand the {}, it has to be a separate argument (i.e. `a {}'). # GNU find is (IMHO) more sensible here, expanding any {} it comes across -# inside an -exec, whether it is a separate argument or part of a word: +# inside an -exec, whether it is a separate arg or part of a word: # # $ touch yes # $ find --version @@ -521,8 +659,8 @@ endif # $ find yes -exec echo oh,{}! \; # oh,yes! # -# I'm not claiming that the above is not possible to achieve with -# other finds, just that GNU find does the Patently Right Thing here :) +# Of course, the above is not impossible to achieve with other finds, +# just that GNU find does the Patently Right Thing here :) # # ====> if you're using these dist rules, get hold of GNU findutils. # @@ -530,27 +668,35 @@ endif # .PHONY: dist dist-pre dist-post +# +# The dist rules leaves out CVS, SRC (from mkshadowdir) and tests +# directories when creating shadow source distrib tree +# dist-pre:: -rm -rf $(SRC_DIST_DIR) -rm -f $(SRC_DIST_NAME).tar.gz - (cd $(FPTOOLS_TOP_ABS); find $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -exec $(MKDIRHIER) $(SRC_DIST_DIR)/{} \; \) ; ) - (cd $(FPTOOLS_TOP_ABS); find $(SRC_DIST_DIRS) -name CVS -prune -o -name SRC -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -type l -exec $(LN_S) $(FPTOOLS_TOP_ABS)/{} $(SRC_DIST_DIR)/{} \; ) + (cd $(FPTOOLS_TOP_ABS); find $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -name tests -prune -o -exec $(MKDIRHIER) $(SRC_DIST_DIR)/{} \; \) ; ) + (cd $(FPTOOLS_TOP_ABS); find $(SRC_DIST_DIRS) -name CVS -prune -o -name SRC -prune -o -name tests -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -type l -exec $(LN_S) $(FPTOOLS_TOP_ABS)/{} $(SRC_DIST_DIR)/{} \; ) # # After having created a shadow distribution tree and copied/linked # all the necessary files to it, `dist-post' makes sure the permissions -# are set right and packages up the tree. +# are set right and then package up the tree. Empty directories are also removed. # # For now, we make the packaging a separate rule, so as to allow # the inspection of the dist tree before eventually packaging it up. # dist-post:: + @echo Deleting the following empty directories.. + ( 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) ) 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 @@ -582,14 +728,26 @@ binary-dist-pre:: -rm -f $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz @for i in $(BIN_DIST_DIRS); do \ if (test -d "$$i"); then \ - echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \ - $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \ - echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion) \ - $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion) \ - echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion) \ - $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion) \ - echo $(MAKE) -C $$i $(MFLAGS) install BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion) libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion) datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion); \ - $(MAKE) -C $$i $(MFLAGS) install BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion) libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion) datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion); \ + echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i-$(ProjectVersion); \ + $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i-$(ProjectVersion); \ + echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion); \ + $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion); \ + echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion); \ + $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion); \ + echo $(MAKE) -C $$i $(MFLAGS) install BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) \ + prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ + exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ + bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i-$(ProjectVersion) \ + libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion) \ + libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion) \ + datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion) ; \ + $(MAKE) -C $$i $(MFLAGS) install BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) \ + prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ + exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ + bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i-$(ProjectVersion) \ + libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion) \ + libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i-$(ProjectVersion) \ + datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion) ; \ fi; \ done @@ -599,6 +757,17 @@ binary-dist-pre:: binary-pack:: ( cd $(BIN_DIST_TMPDIR); $(TAR) chzf $(BIN_DIST_NAME).tar.gz $(BIN_DIST_NAME); rm -rf $(BIN_DIST_NAME) ) +ifneq "$(way)" "" +package-way-dist:: + ( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar ) + gzip $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar +endif + +ifneq "$(way)" "" +remove-way-dist:: + ( cd $(BIN_DIST_TMPDIR); find $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec rm -f {} \; ) +endif + ########################################### # # Targets: check tags show info @@ -627,11 +796,12 @@ TAGS:: $(SOURCES) @$(RM) TAGS @touch TAGS ifneq "$(HS_SRCS)" "" - $(HSTAGS) $(HSTAGS_OPTS) -- $(HS_SRCS) + $(HSTAGS) $(HSTAGS_OPTS) -- $(TAGS_HS_SRCS) endif ifneq "$(C_SRCS)" "" - etags -a $(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? #------------------------------------------------------------ # Makefile debugging @@ -647,7 +817,7 @@ show: .PHONY: dvi ps html info txt -info:: $(filter %.texinfo, $(DOC_SRCS)) $(filter %.texi,$(DOC_SRCS)) +info:: $(DOC_INFO) dvi:: $(DOC_DVI) ps:: $(DOC_PS) html:: $(DOC_HTML) @@ -689,15 +859,16 @@ 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 . 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 $@ endif - ########################################### # # Targets: clean @@ -743,7 +914,8 @@ endif ifneq "$(HS_OBJS)" "" ifneq "$(filter -split-objs,$(HC_OPTS))" "" clean :: - find $(patsubst %.$(way_)o,%,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food; + find $(patsubst %.$(way_)o,%,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food + -rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS)) endif endif @@ -790,9 +962,11 @@ WAY_TARGETS = $(foreach way,$(WAYS),$(foreach suffix, $(FPTOOLS_SUFFIXES), % LIB_WAY_TARGETS = $(foreach way,$(WAYS),%_$(way).a %_$(way)) # $@ will be something like Foo.p_o -# $(suffix $@) will be .p_o -# The sed script extracts the "p" part. - +# $(suffix $@) returns .p_o +# $(subst .,.p_o) returns p_o +# $(subst _,.,p_o) returns p.o (clever) +# $(basename p.o) returns p +# $(WAY_TARGETS) : $(MAKE) way=$(basename $(subst _,.,$(subst .,,$(suffix $@)))) $@ @@ -834,13 +1008,25 @@ ifeq "$(way)" "" ifneq "$(SUBDIRS)" "" all docs runtests boot TAGS clean veryclean maintainer-clean install info :: - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ + @echo "------------------------------------------------------------------------" + @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 \ - $(MAKE) -C $$i $(MFLAGS) $@; \ + echo "------------------------------------------------------------------------"; \ + echo "==fptools== $(MAKE) $@;"; \ + echo " in $(shell pwd)/$$i"; \ + echo "------------------------------------------------------------------------"; \ + $(MAKE) --no-print-directory -C $$i $(MFLAGS) $@; \ done + @echo "------------------------------------------------------------------------" + @echo "===fptools== Finished making \`$@' in $(SUBDIRS) ..." + @echo "PWD = $(shell pwd)" + @echo "------------------------------------------------------------------------" dist :: - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ + @case '${MFLAGS}' in -*[ik]*) set +e;; *) set -e;; esac; \ for i in $(SUBDIRS) ; do \ $(MKDIRHIER_PREFIX)mkdirhier $(SRC_DIST_DIR)/$$i; \ $(MAKE) -C $$i $(MFLAGS) $@ SRC_DIST_DIR=$(SRC_DIST_DIR)/$$i; \ @@ -864,9 +1050,22 @@ ifeq "$(way)" "" # boot info TAGS # since these are way-independent all docs runtests 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; \ for i in $(WAYS) ; do \ - $(MAKE) way=$$i $(MFLAGS) $@ ; \ + echo "------------------------------------------------------------------------"; \ + echo "==fptools== $(MAKE) way=$$i $@;"; \ + echo "PWD = $(shell pwd)"; \ + echo "------------------------------------------------------------------------"; \ + $(MAKE) way=$$i --no-print-directory $(MFLAGS) $@ ; \ done + @echo "------------------------------------------------------------------------" + @echo "===fptools== Finished recursively making \`$@' for ways: $(WAYS) ..." + @echo "PWD = $(shell pwd)" + @echo "------------------------------------------------------------------------" endif endif