From 8aa6ae86d7cdec880233e8cb20ed8b5a821866c4 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 9 Apr 2001 14:40:09 +0000 Subject: [PATCH] * subdirs.am (RECURSIVE_TARGETS): New variable. Use it. * automake.in (&handle_subdirs): Output it. (&file_contents_internal): Support value spread on several lines. --- ChangeLog | 7 +++++++ Makefile.in | 18 ++++++++++-------- automake.in | 3 +++ lib/am/subdirs.am | 21 +++++++++------------ subdirs.am | 21 +++++++++------------ 5 files changed, 38 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1633c22f..50682aae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-04-09 Akim Demaille + + * subdirs.am (RECURSIVE_TARGETS): New variable. + Use it. + * automake.in (&handle_subdirs): Output it. + (&file_contents_internal): Support value spread on several lines. + 2001-04-09 Akim Demaille * automake.in (&handle_man_pages): Rely on mans.am to define diff --git a/Makefile.in b/Makefile.in index 4a939b41..56d4330b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -129,6 +129,12 @@ DVIS = automake.dvi 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 ansi2knr.c automake.in \ @@ -308,10 +314,7 @@ uninstall-dist_scriptDATA: # (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//`; \ @@ -577,7 +580,7 @@ uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \ 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 \ @@ -586,9 +589,8 @@ uninstall-info: uninstall-info-recursive 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 \ diff --git a/automake.in b/automake.in index 5cbfc37b..55885e44 100755 --- a/automake.in +++ b/automake.in @@ -3189,6 +3189,7 @@ sub handle_subdirs } $output_rules .= &file_contents ('subdirs'); + variable_pretty_output ('RECURSIVE_TARGETS', 'TRUE'); } @@ -6874,6 +6875,8 @@ 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; macro_define ($var, 1, $type, $cond, $val, $.); push (@var_list, $var); diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am index 488d3b3e..2c0f810e 100644 --- a/lib/am/subdirs.am +++ b/lib/am/subdirs.am @@ -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//`; \ diff --git a/subdirs.am b/subdirs.am index 488d3b3e..2c0f810e 100644 --- a/subdirs.am +++ b/subdirs.am @@ -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//`; \ -- 2.43.5