Index: ChangeLog
from Akim Demaille <[EMAIL PROTECTED]>
* subdirs.am (RECURSIVE_TARGETS): New variable.
Use it.
* automake.in (&handle_subdirs): Output it.
(&file_contents_internal): Support value spread on several lines.
Index: Makefile.in
--- Makefile.in Sun, 11 Mar 2001 22:42:47 +0100 akim (am/h/16_Makefile.i 1.52 644)
+++ Makefile.in Tue, 13 Mar 2001 01:14:50 +0100 akim (am/h/16_Makefile.i 1.52 644)
@@ -130,6 +130,12 @@
TEXINFOS = automake.texi
DATA = $(dist_pkgdata_DATA) $(dist_script_DATA)
+
+RECURSIVE_TARGETS = all-recursive install-data-recursive \
+ install-exec-recursive installdirs-recursive install-recursive \
+ uninstall-recursive install-info-recursive \
+ uninstall-info-recursive check-recursive installcheck-recursive \
+ info-recursive dvi-recursive
DIST_COMMON = README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \
COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS \
README-alpha THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 \
@@ -311,10 +317,7 @@
# (1) if the variable is set in `config.status', edit `config.status'
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-install-info-recursive uninstall-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
+$(RECURSIVE_TARGETS):
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
@@ -581,7 +584,7 @@
uninstall-info: uninstall-info-recursive
-.PHONY: all all-am all-recursive check check-am check-recursive clean \
+.PHONY: $(RECURSIVE_TARGETS) all all-am check check-am clean \
clean-generic clean-recursive dist dist-all dist-info distcheck \
distclean distclean-generic distclean-recursive distclean-tags \
distdir dvi dvi-am dvi-recursive info info-am info-recursive \
@@ -590,9 +593,8 @@
install-dist_scriptDATA install-exec install-exec-am \
install-exec-recursive install-info install-info-recursive \
install-man install-recursive install-strip installcheck \
- installcheck-am installcheck-local installcheck-recursive \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-aminfo \
+ installcheck-am installcheck-local installdirs installdirs-am \
+ installdirs-recursive maintainer-clean maintainer-clean-aminfo \
maintainer-clean-generic maintainer-clean-recursive \
maintainer-clean-vti mostlyclean mostlyclean-aminfo \
mostlyclean-generic mostlyclean-recursive mostlyclean-vti tags \
Index: automake.in
--- automake.in Tue, 13 Mar 2001 00:44:27 +0100 akim (am/f/39_automake.i 1.185 755)
+++ automake.in Tue, 13 Mar 2001 01:12:52 +0100 akim (am/f/39_automake.i 1.185 755)
@@ -3189,6 +3189,7 @@ sub handle_subdirs
}
$output_rules .= &file_contents ('subdirs');
+ variable_pretty_output ('RECURSIVE_TARGETS', 'TRUE');
}
@@ -6868,6 +6869,9 @@ sub file_contents_internal ($%)
if (!defined $var_comment{$var}
|| substr ($var_comment{$var}, -1) ne "\n");
$var_comment{$var} .= "$comment";
+ # Strip the continuation backslashes.
+ $val =~ s/\\$//mg;
+ print STDERR "VAL: $val\n";
variable_define ($var, 1, $type, $cond, $val, $.);
push (@var_list, $var);
Index: automake.in
--- automake.in Tue, 13 Mar 2001 01:18:40 +0100 akim (am/f/39_automake.i 1.186 755)
+++ automake.in Tue, 13 Mar 2001 01:25:23 +0100 akim (am/f/39_automake.i 1.186 755)
@@ -6871,7 +6871,6 @@ sub file_contents_internal ($%)
$var_comment{$var} .= "$comment";
# Strip the continuation backslashes.
$val =~ s/\\$//mg;
- print STDERR "VAL: $val\n";
variable_define ($var, 1, $type, $cond, $val, $.);
push (@var_list, $var);
Index: subdirs.am
--- subdirs.am Fri, 02 Mar 2001 00:21:13 +0100 akim (am/g/14_subdirs.am 1.8 644)
+++ subdirs.am Tue, 13 Mar 2001 01:14:47 +0100 akim (am/g/14_subdirs.am 1.8 644)
@@ -17,6 +17,14 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
+RECURSIVE_TARGETS += \
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive \
+?INSTALL-INFO?install-info-recursive uninstall-info-recursive \
+check-recursive installcheck-recursive info-recursive dvi-recursive
+
+.PHONY: $(RECURSIVE_TARGETS)
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -24,18 +32,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
-
-.PHONY: \
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-?INSTALL-INFO?install-info-recursive uninstall-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive
-
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-?INSTALL-INFO?install-info-recursive uninstall-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
+$(RECURSIVE_TARGETS):
@set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
