From: Tom Tromey Date: Tue, 21 Oct 1997 17:01:38 +0000 (+0000) Subject: empty subdirs bug fix X-Git-Tag: v1.10.2~3033 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9193017631d0520f3e41d3f0e1eff65c50fe2f9;p=platform%2Fupstream%2Fautomake.git empty subdirs bug fix --- diff --git a/ChangeLog b/ChangeLog index 618cc49..1dcd4a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Tue Oct 21 00:39:44 1997 Tom Tromey + * subdirs.am (check-recursive installcheck-recursive + info-recursive dvi-recursive): Handle case when SUBDIRS is empty. + (maintainer-clean-recursive): Likewise. From Assar Westerlund. + * aclocal.in (scan_m4_files): If macro recognized, &search will return 1. (scan_configure): If AM_ macro not found, give error. diff --git a/THANKS b/THANKS index b3537cb..b838cdc 100644 --- a/THANKS +++ b/THANKS @@ -7,6 +7,7 @@ Alexander V. Lukyanov lav@yars.free.net Alexandre Oliva oliva@dcc.unicamp.br Andreas Schwab schwab@lamothe.informatik.uni-dortmund.de Anthony Green green@cygnus.com +Assar Westerlund assar@sics.se Bernard Urban Bernard.Urban@meteo.fr Bill Fenner fenner@parc.xerox.com David A. Swierczek swiercze@mr.med.ge.com diff --git a/TODO b/TODO index 5a47ebf..d5be0ee 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,5 @@ +* when cleaning, should recurse depth first + * quoting bugs - how to install file with a space in its name? @@ -10,7 +12,7 @@ * add $(srcdir)/ before some dependencies? -* mention PACKAGE/VERSIOn -vs- autoheader in manual +* mention PACKAGE/VERSION -vs- autoheader in manual * define LINK if a program is mentioned, even if no C sources appear diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am index 46d62a7..5eb3057 100644 --- a/lib/am/subdirs.am +++ b/lib/am/subdirs.am @@ -28,7 +28,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -46,7 +46,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$subdir $$rev"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ diff --git a/subdirs.am b/subdirs.am index 46d62a7..5eb3057 100644 --- a/subdirs.am +++ b/subdirs.am @@ -28,7 +28,7 @@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ (cd $$subdir && $(MAKE) $$target) \ @@ -46,7 +46,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive: mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ - rev=''; for subdir in $(SUBDIRS); do rev="$$subdir $$rev"; done; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + done; \ for subdir in $$rev; do \ target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \