Hello,
I made a few cosmetic changes.
Attached to this mail please find the patch.
Besides this, I run `diff -w' before I added this year to copyright
lines. This diff shows the chnages better; it is attached, too.
Moreover, I noticed that the *.am files often use
else :; fi;
instead of mere
fi;
I don't like it; s there a reason for this?
Have a nice day,
Stepan Kasal
2005-07-29 Stepan Kasal <[EMAIL PROTECTED]>
* lib/am/distdir.am: There is no need to call `test -d' before
`$(mkdir_p)'. Cosmetic chnages.
* lib/am/subdirs.am: Cosmetic changes.
* lib/am/tags.am: Cosmetic changes.
Index: lib/am/distdir.am
===================================================================
RCS file: /cvsroot/automake/automake/lib/am/distdir.am,v
retrieving revision 1.61
diff -u -r1.61 distdir.am
--- lib/am/distdir.am 14 May 2005 20:28:53 -0000 1.61
+++ lib/am/distdir.am 29 Jul 2005 06:47:33 -0000
@@ -165,19 +165,17 @@
##
if %?SUBDIRS%
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ test $$subdir = . && continue; \
+ $(mkdir_p) $(distdir)/$$subdir \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
|| exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
done
endif %?SUBDIRS%
##
Index: lib/am/subdirs.am
===================================================================
RCS file: /cvsroot/automake/automake/lib/am/subdirs.am,v
retrieving revision 1.59
diff -u -r1.59 subdirs.am
--- lib/am/subdirs.am 14 May 2005 20:28:53 -0000 1.59
+++ lib/am/subdirs.am 29 Jul 2005 06:47:33 -0000
@@ -90,9 +90,7 @@
*) list='$(SUBDIRS)' ;; \
esac; \
rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
+ test $$subdir != . && rev="$$subdir $$rev"; \
done; \
## Always do `.' last.
rev="$$rev ."; \
Index: lib/am/tags.am
===================================================================
RCS file: /cvsroot/automake/automake/lib/am/tags.am,v
retrieving revision 1.43
diff -u -r1.43 tags.am
--- lib/am/tags.am 14 May 2005 20:28:53 -0000 1.43
+++ lib/am/tags.am 29 Jul 2005 06:47:33 -0000
@@ -61,11 +61,10 @@
?SUBDIRS? fi; \
?SUBDIRS? list='$(SUBDIRS)'; for subdir in $$list; do \
## Do nothing if we're trying to look in `.'.
-?SUBDIRS? if test "$$subdir" = .; then :; else \
-?SUBDIRS? test ! -f $$subdir/TAGS || \
+?SUBDIRS? test $$subdir = . && continue; \
+?SUBDIRS? test ! -f $$subdir/TAGS || \
## Note that the = is mandatory for --etags-include.
-?SUBDIRS? tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-?SUBDIRS? fi; \
+?SUBDIRS? tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
?SUBDIRS? done; \
## Make sure the list of sources is unique.
list='$(SOURCES) $(HEADERS) %CONFIG% $(LISP) $(TAGS_FILES)'; \
@@ -76,7 +75,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
## Make sure we have something to run etags on.
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ if test -n "$(ETAGS_ARGS)$$tags$$unique"; then \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique; \
Index: lib/am/distdir.am
===================================================================
RCS file: /cvsroot/automake/automake/lib/am/distdir.am,v
retrieving revision 1.61
diff -u -w -r1.61 distdir.am
--- lib/am/distdir.am 14 May 2005 20:28:53 -0000 1.61
+++ lib/am/distdir.am 29 Jul 2005 06:47:47 -0000
@@ -165,9 +165,8 @@
##
if %?SUBDIRS%
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ test $$subdir = . && continue; \
+ $(mkdir_p) $(distdir)/$$subdir \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -177,7 +176,6 @@
distdir="$$distdir/$$subdir" \
distdir) \
|| exit 1; \
- fi; \
done
endif %?SUBDIRS%
##
Index: lib/am/subdirs.am
===================================================================
RCS file: /cvsroot/automake/automake/lib/am/subdirs.am,v
retrieving revision 1.59
diff -u -w -r1.59 subdirs.am
--- lib/am/subdirs.am 14 May 2005 20:28:53 -0000 1.59
+++ lib/am/subdirs.am 29 Jul 2005 06:47:47 -0000
@@ -90,9 +90,7 @@
*) list='$(SUBDIRS)' ;; \
esac; \
rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
+ test $$subdir != . && rev="$$subdir $$rev"; \
done; \
## Always do `.' last.
rev="$$rev ."; \
Index: lib/am/tags.am
===================================================================
RCS file: /cvsroot/automake/automake/lib/am/tags.am,v
retrieving revision 1.43
diff -u -w -r1.43 tags.am
--- lib/am/tags.am 14 May 2005 20:28:53 -0000 1.43
+++ lib/am/tags.am 29 Jul 2005 06:47:47 -0000
@@ -61,11 +61,10 @@
?SUBDIRS? fi; \
?SUBDIRS? list='$(SUBDIRS)'; for subdir in $$list; do \
## Do nothing if we're trying to look in `.'.
-?SUBDIRS? if test "$$subdir" = .; then :; else \
+?SUBDIRS? test $$subdir = . && continue; \
?SUBDIRS? test ! -f $$subdir/TAGS || \
## Note that the = is mandatory for --etags-include.
?SUBDIRS? tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-?SUBDIRS? fi; \
?SUBDIRS? done; \
## Make sure the list of sources is unique.
list='$(SOURCES) $(HEADERS) %CONFIG% $(LISP) $(TAGS_FILES)'; \
@@ -76,7 +75,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
## Make sure we have something to run etags on.
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ if test -n "$(ETAGS_ARGS)$$tags$$unique"; then \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique; \
