make -k fix from ian

diff --git a/ChangeLog b/ChangeLog
index 3322edef58e4f7123bb479c0ec53600981cdf2b7..ba258ab3f812e65f96e28e133fe85b5f8f99e2fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May  6 15:22:41 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+       * subdirs.am: Fix check for make -k to use $(MAKEFLAGS) and to not
+       get fooled by command line arguments.
+
 Sat May 10 15:48:46 1997  Tom Tromey  <tromey@cygnus.com>
 
        * m4/ccstdc.m4: Print "none needed" if compiler accepts ANSI C by

diff --git a/TODO b/TODO
index 7065445dc2dbff56fb03344c9f402ba96a6f8a0d..951ec33ad8397325acabc45fc524f1a402aefa8d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+* in --cygnus, clean-info not generated at top level
+
 * update text in missing
   avoid passive voice
 

diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 0622e8dda33e15c45ec869f4909a947f35130e27..42330d6d33aeb416d35164b4fe24302c1b88f100 100644 (file)
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -27,13 +27,14 @@
 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
-       @for subdir in $(SUBDIRS); do \
+       @set fnord $(MAKEFLAGS); amf=$$2; \
+       for subdir in $(SUBDIRS); do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
          (cd $$subdir && $(MAKE) $$target) \
 ## This trick allows "-k" to keep its natural meaning when running a
 ## recursive rule.
-          || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done && test -z "$$fail"
 
 ## We run all `clean' targets in reverse order.  Why?  It's an attempt
@@ -44,12 +45,13 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 ## bombs.
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-       @rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+       @set fnord $(MAKEFLAGS); amf=$$2; \
+       rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
          (cd $$subdir && $(MAKE) $$target) \
 ## This trick allows "-k" to keep its natural meaning when running a
 ## recursive rule.
-          || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done && test -z "$$fail"

diff --git a/subdirs.am b/subdirs.am
index 0622e8dda33e15c45ec869f4909a947f35130e27..42330d6d33aeb416d35164b4fe24302c1b88f100 100644 (file)
--- a/subdirs.am
+++ b/subdirs.am
@@ -27,13 +27,14 @@
 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
-       @for subdir in $(SUBDIRS); do \
+       @set fnord $(MAKEFLAGS); amf=$$2; \
+       for subdir in $(SUBDIRS); do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
          (cd $$subdir && $(MAKE) $$target) \
 ## This trick allows "-k" to keep its natural meaning when running a
 ## recursive rule.
-          || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done && test -z "$$fail"
 
 ## We run all `clean' targets in reverse order.  Why?  It's an attempt
@@ -44,12 +45,13 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 ## bombs.
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-       @rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+       @set fnord $(MAKEFLAGS); amf=$$2; \
+       rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
          (cd $$subdir && $(MAKE) $$target) \
 ## This trick allows "-k" to keep its natural meaning when running a
 ## recursive rule.
-          || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
        done && test -z "$$fail"