X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=c46d23d57933a81ffb20826a4b5602d7c7b734d8;hb=1d5a157c646f497c36a11588f5d0c1442eb7c777;hp=4da238e8fc6e0130eba6341179cfc01e769b2f48;hpb=b965a36a1cd1732eaa7fa4cea4bc0c86132d04fe;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 4da238e..c46d23d 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -59,6 +59,9 @@
 #
 .PHONY: depend
 
+# Compiler produced files that are targets of the source's imports.
+MKDEPENDHS_OBJ_SUFFICES=o
+
 depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS)
 	@$(RM) .depend
 	@touch .depend
@@ -69,19 +72,13 @@ ifneq "$(MKDEPENDC_SRCS)" ""
 	$(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS)
 endif
 ifneq "$(MKDEPENDHS_SRCS)" ""
-	@if echo $(notdir $(MKDEPENDHS)) | grep -s ghc ; then \
-	   echo $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS) ; \
-	   $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(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
@@ -371,18 +368,26 @@ 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 "#!/bin/sh -- # to stop perl from looping " > $@
-	@echo "eval 'exec perl -S $$$""0 $$""{1+\"$$$""@\"}'"  >> $@
-	@echo "      if $$""running_under_some_shell;"         >> $@
+	echo "#! "$(PERL) > $@
 else
 	@touch $@
 endif
@@ -412,11 +417,11 @@ endif
 # For each of these variables that is defined, you
 # get one install rule
 #
-#	INSTALL_PROGS 	 install these executable programs in $(bindir)
-#	INSTALL_SCRIPTS	 install these executable scripts 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.
@@ -452,7 +457,7 @@ ifneq "$(INSTALL_PROGS)" ""
 install:: $(INSTALL_PROGS)
 	@$(INSTALL_DIR) $(bindir)
 	for i in $(INSTALL_PROGS); do \
-		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(bindir); \
+		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(bindir); \
 	done
 endif
 
@@ -467,13 +472,11 @@ ifeq "$(INTERP)" "perl"
 ifneq "$(BIN_DIST)" "1"
 	@for i in $(INSTALL_SCRIPTS); do \
 	   $(RM) $$i.tmp; \
-	   @echo "#!/bin/sh -- # to stop perl from looping "        > $$i.tmp ; \
-	   echo "eval 'exec $(PERL) -S $$$""0 $$""{1+\"$$$""@\"}'" >> $$i.tmp ; \
-	   echo "      if $$""running_under_some_shell;"           >> $$i.tmp ; \
-	   echo $$"bindir='$(bindir)';"                            >> $$i.tmp ; \
-	   echo $$"libdir='$(libdir)';"                            >> $$i.tmp ; \
-	   echo $$"libexecdir='$(libexecdir)';"                    >> $$i.tmp ; \
-	   echo $$"datadir='$(datadir)';"                          >> $$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 ; \
@@ -498,13 +501,11 @@ ifeq "$(INTERP)" "perl"
 ifneq "$(BIN_DIST)" "1"
 	@for i in $(INSTALL_LIB_SCRIPTS); do \
 	   $(RM) $$i.tmp; \
-	   @echo "#!/bin/sh -- # to stop perl from looping "        > $$i.tmp ; \
-	   echo "eval 'exec $(PERL) -S $$$""0 $$""{1+\"$$$""@\"}'" >> $$i.tmp ; \
-	   echo "      if $$""running_under_some_shell;"           >> $$i.tmp ; \
-	   echo $$"bindir='$(bindir)';"                            >> $$i.tmp ; \
-	   echo $$"libdir='$(libdir)';"                            >> $$i.tmp ; \
-	   echo $$"libexecdir='$(libexecdir)';"                    >> $$i.tmp ; \
-	   echo $$"datadir='$(datadir)';"                          >> $$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 ; \
@@ -529,13 +530,11 @@ ifeq "$(INTERP)" "perl"
 ifneq "$(BIN_DIST)" "1"
 	@for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
 	   $(RM) $$i.tmp; \
-	   @echo "#!/bin/sh -- # to stop perl from looping "        > $$i.tmp ; \
-	   echo "eval 'exec $(PERL) -S $$$""0 $$""{1+\"$$$""@\"}'" >> $$i.tmp ; \
-	   echo "      if $$""running_under_some_shell;"           >> $$i.tmp ; \
-	   echo $$"bindir='$(bindir)';"                            >> $$i.tmp ; \
-	   echo $$"libdir='$(libdir)';"                            >> $$i.tmp ; \
-	   echo $$"libexecdir='$(libexecdir)';"                    >> $$i.tmp ; \
-	   echo $$"datadir='$(datadir)';"                          >> $$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 ; \
@@ -557,7 +556,13 @@ ifneq "$(INSTALL_LIBS)" ""
 install:: $(INSTALL_LIBS)
 	@$(INSTALL_DIR) $(libdir)
 	for i in $(INSTALL_LIBS); do \
-		$(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \
+		case $$i in \
+		  *.a) \
+		    $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \
+		    $(RANLIB) $(libdir)/`basename $$i` ;; \
+		  *) \
+		    $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(libdir); \
+		esac; \
 	done
 endif
 
@@ -565,7 +570,7 @@ ifneq "$(INSTALL_LIBEXECS)" ""
 install:: $(INSTALL_LIBEXECS)
 	@$(INSTALL_DIR) $(libexecdir)
 	-for i in $(INSTALL_LIBEXECS); do \
-		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(libexecdir); \
+		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i$(exeext) $(libexecdir); \
 	done
 endif
 
@@ -665,7 +670,7 @@ 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 -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)/{} \; )
+	(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 -name "\#*" -prune -o -name ".\#*" -prune -o -type l -exec $(LN_S) $(FPTOOLS_TOP_ABS)/{} $(SRC_DIST_DIR)/{} \; )
 
 #
 # After having created a shadow distribution tree and copied/linked
@@ -716,27 +721,27 @@ 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 			 \
-	   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); \
+	  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); \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion); \
+	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(ProjectVersion); \
+	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(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) ; \
+			bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
+			libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
+			libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
+			datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(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) ; \
+			bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
+			libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
+			libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion) \
+			datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$(ProjectNameShort)-$(ProjectVersion) ; \
 	  fi; \
 	done
 
@@ -785,11 +790,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
@@ -857,6 +863,30 @@ else
 	cp $(TEXI2HTML_PREFIX)invisible.xbm html/
 	@touch $@
 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)))
+
+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).
+
 ###########################################
 #
 #	Targets: clean
@@ -902,7 +932,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
 
@@ -991,18 +1022,30 @@ endif	# if way
 
 # 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)" ""
 
 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 "------------------------------------------------------------------------"
-	@for i in $(SUBDIRS) ; do \
+	@case '${MFLAGS}' in *-[ik]*) set +e;; *-r*[ik]*) set +e;; *) set -e;; 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) $@; \
@@ -1013,7 +1056,7 @@ all docs runtests boot TAGS clean veryclean maintainer-clean install info ::
 	@echo "------------------------------------------------------------------------"
 
 dist ::
-	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
+	@case '${MFLAGS}' in *-[ik]*) set +e;; *-r*[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; \
@@ -1041,7 +1084,8 @@ all docs runtests TAGS clean veryclean maintainer-clean install ::
 	@echo "===fptools== Recursively making \`$@' for ways: $(WAYS) ..."
 	@echo "PWD = $(shell pwd)"
 	@echo "------------------------------------------------------------------------"
-	@for i in $(WAYS) ; do \
+	@case '${MFLAGS}' in *-[ik]*) set +e;; *-r*[ik]*) set +e;; *) set -e;; esac; \
+	for i in $(WAYS) ; do \
 	  echo "------------------------------------------------------------------------"; \
 	  echo "==fptools== $(MAKE) way=$$i $@;"; \
 	  echo "PWD = $(shell pwd)"; \