Improve self-documentation of 'for' loop commands.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 6e879e3..b7f5728 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,14 @@
 2012-01-15  Keith Marshall  <keithmarshall@users.sf.net>
 
+       Improve self-documentation of 'for' loop commands.
+
+       * Makefile.in lib/Makefile.in:
+       * lib/ddk/Makefile.in lib/directx/Makefile.in: In 'for' loops invoked
+       by rule commands, prefer use of 'dir' and 'file' appropriately, as the
+       loop control variables, rather than non-descript 'i'.
+
+2012-01-15  Keith Marshall  <keithmarshall@users.sf.net>
+
        Generalise 'all' rule to arbitrary prerequisite sub-directories.
 
        * Makefile.in: (all): Make it depend on all $(SUBDIRS), not just on...

diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
index 39892c8..d72f4e8 100644 (file)
--- a/winsup/w32api/Makefile.in
+++ b/winsup/w32api/Makefile.in
@@ -36,8 +36,8 @@ DISTFILES = \
 all: $(SUBDIRS)
 
 %-subdirs:
-       for i in $(SUBDIRS); do \
-         $(MAKE) -C $$i $*; \
+       for dir in $(SUBDIRS); do \
+         $(MAKE) -C $$dir $*; \
        done
 
 $(SUBDIRS):
@@ -47,8 +47,8 @@ test:
        $(MAKE) -C lib test
 
 install uninstall:
-       for i in $(SUBDIRS); do \
-               (cd $$i; $(MAKE) $@); \
+       for dir in $(SUBDIRS); do \
+         (cd $$dir; $(MAKE) $@); \
        done
 
 ifdef SNAPDATE
@@ -79,11 +79,11 @@ srcdist:
        rm -rf $(distdir)
        mkdir $(distdir)
        chmod 755 $(distdir)
-       for i in $(DISTFILES); do \
-               cp -p $(srcdir)/$$i $(distdir)/$$i ; \
+       for file in $(DISTFILES); do \
+               cp -p $(srcdir)/$$file $(distdir)/$$file ; \
        done
-       for i in $(SUBDIRS); do \
-               (cd $$i; $(MAKE) distdir=../$(distdir) dist); \
+       for dir in $(SUBDIRS); do \
+         (cd $$dir; $(MAKE) distdir=../$(distdir) dist); \
        done
        rm -f $(distdir)-src$(TARFILEEXT)
        $(TAR) $(TARFLAGS)cf $(distdir)-src$(TARFILEEXT) $(distdir)

diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index b569044..d1264fe 100644 (file)
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -82,8 +82,8 @@ DISTFILES = Makefile.in $(DEF_FILES) $(MRI_FILES) $(SOURCES)
 all-default: $(EXTRA_OBJS) $(LIBS) ddk directx
 
 %-subdirs:
-       for i in $(SUBDIRS); do \
-         $(MAKE) -C $$i $*; \
+       for dir in $(SUBDIRS); do \
+         $(MAKE) -C $$dir $*; \
        done
 
 ddk:
@@ -98,16 +98,16 @@ TEST_OPTIONS = $(ALL_CFLAGS) -DWINVER=0x0666  \
 test:
        @echo "Testing w32api..."
        @for lang in c c++ objective-c ; do \
-               echo "$$lang..."; \
-               $(CC) -x$$lang $(TEST_OPTIONS) ; \
-               echo "$$lang UNICODE..."; \
-               $(CC) -x$$lang -DUNICODE $(TEST_OPTIONS) ; \
+         echo "$$lang..."; \
+         $(CC) -x$$lang $(TEST_OPTIONS); \
+         echo "$$lang UNICODE..."; \
+         $(CC) -x$$lang -DUNICODE $(TEST_OPTIONS); \
        done
        @echo "windres..."
-       @$(WINDRES) --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
+       $(WINDRES) --include-dir $(INCDIR) -i ${srcdir}/res.rc -o test.o
        @echo "windres UNICODE..."
-       @$(WINDRES) --define UNICODE --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
-       @rm -f test.o
+       $(WINDRES) --define UNICODE --include-dir $(INCDIR) -i ${srcdir}/res.rc -o test.o
+       rm -f test.o
 
 scrnsavw.o: scrnsave.c
        $(CC) -c $(ALL_CFLAGS) -DUNICODE -o $@ $<
@@ -136,22 +136,22 @@ install: install-libraries install-headers install-ddk install-directx
 
 install-libraries: all $(need-DESTDIR-compatibility)
        $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-       for i in $(LIBS); do \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(inst_libdir)/$$i ; \
+       for file in $(LIBS); do \
+         $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/$$file ; \
        done
 
 install-headers: $(need-DESTDIR-compatibility)
        $(mkinstalldirs) $(DESTDIR)$(inst_includedir)
-       for i in $(HEADERS); do \
-               $(INSTALL_DATA) $(srcdir)/../include/$$i $(DESTDIR)$(inst_includedir)/$$i ; \
+       for file in $(HEADERS); do \
+         $(INSTALL_DATA) $(srcdir)/../include/$$file $(DESTDIR)$(inst_includedir)/$$file ; \
        done
        $(mkinstalldirs) $(DESTDIR)$(inst_includedir)/GL
-       for i in $(GL_HEADERS); do \
-               $(INSTALL_DATA) $(srcdir)/../include/GL/$$i $(DESTDIR)$(inst_includedir)/GL/$$i ; \
+       for file in $(GL_HEADERS); do \
+         $(INSTALL_DATA) $(srcdir)/../include/GL/$$file $(DESTDIR)$(inst_includedir)/GL/$$file ; \
        done
        $(mkinstalldirs) $(DESTDIR)$(inst_includedir)/gdiplus
-       for i in $(GDIPLUS_HEADERS); do \
-               $(INSTALL_DATA) $(srcdir)/../include/gdiplus/$$i $(DESTDIR)$(inst_includedir)/gdiplus/$$i ; \
+       for file in $(GDIPLUS_HEADERS); do \
+         $(INSTALL_DATA) $(srcdir)/../include/gdiplus/$$file $(DESTDIR)$(inst_includedir)/gdiplus/$$file ; \
        done
 
 install-ddk: install-libraries install-headers
@@ -165,14 +165,14 @@ install-directx: install-libraries install-headers
 uninstall: uninstall-ddk uninstall-directx uninstall-libraries uninstall-headers
 
 uninstall-libraries: $(need-DESTDIR-compatibility)
-       @for i in $(LIBS); do \
-               rm -f $(DESTDIR)$(inst_libdir)/$$i ; \
+       for file in $(LIBS); do \
+         rm -f $(DESTDIR)$(inst_libdir)/$$file ; \
        done
        rmdir $(DESTDIR)$(inst_libdir)
 
 uninstall-headers: $(need-DESTDIR-compatibility)
-       @for i in $(HEADERS); do \
-               rm -r $(DESTDIR)$(inst_includedir)/$$i ; \
+       for file in $(HEADERS); do \
+         rm -r $(DESTDIR)$(inst_includedir)/$$file ; \
        done
        rmdir $(DESTDIR)$(inst_includedir)
 
@@ -185,24 +185,24 @@ uninstall-directx:
 dist:
        mkdir $(distdir)/include
        chmod 755 $(distdir)/include
-       @for i in $(HEADERS); do \
-               cp -p $(srcdir)/../include/$$i $(distdir)/include/$$i ; \
+       for file in $(HEADERS); do \
+         cp -p $(srcdir)/../include/$$file $(distdir)/include/$$file ; \
        done
        mkdir $(distdir)/include/GL
-       @for i in $(GL_HEADERS); do \
-               cp -p $(srcdir)/../include/GL/$$i $(distdir)/include/GL/$$i ; \
+       for file in $(GL_HEADERS); do \
+         cp -p $(srcdir)/../include/GL/$$file $(distdir)/include/GL/$$file ; \
        done
        mkdir $(distdir)/include/gdiplus
-       @for i in $(GDIPLUS_HEADERS); do \
-               cp -p $(srcdir)/../include/gdiplus/$$i $(distdir)/include/gdiplus/$$i ; \
+       for file in $(GDIPLUS_HEADERS); do \
+         cp -p $(srcdir)/../include/gdiplus/$$file $(distdir)/include/gdiplus/$$file ; \
        done
        mkdir $(distdir)/lib
        chmod 755 $(distdir)/lib
-       @for i in $(DISTFILES); do \
-               cp -p $(srcdir)/$$i $(distdir)/lib/$$i ; \
+       for file in $(DISTFILES); do \
+         cp -p $(srcdir)/$$file $(distdir)/lib/$$file ; \
        done
-       for i in $(SUBDIRS); do \
-               (cd $$i; $(MAKE) distdir=../$(distdir) dist); \
+       for dir in $(SUBDIRS); do \
+         (cd $$dir; $(MAKE) distdir=../$(distdir) dist); \
        done
 
 Makefile: Makefile.in ../config.status ../configure

diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in
index 5cc4dd6..ce6eb39 100644 (file)
--- a/winsup/w32api/lib/ddk/Makefile.in
+++ b/winsup/w32api/lib/ddk/Makefile.in
@@ -59,17 +59,17 @@ TEST_OPTIONS = $(ALL_CFLAGS) -Wall -pedantic -Wsystem-headers -c $(srcdir)/test.
 .PHONY: test
 test:
        @echo "Testing ddk..."
-       @for lang in c c++ objective-c ; do \
-               echo "$$lang..."; \
-               $(CC) -x$$lang $(TEST_OPTIONS) ; \
-               echo "$$lang UNICODE..."; \
-               $(CC) -x$$lang -DUNICODE $(TEST_OPTIONS) ; \
+       @for lang in c c++ objective-c; do \
+         echo "$$lang..."; \
+         $(CC) -x$$lang $(TEST_OPTIONS); \
+         echo "$$lang UNICODE..."; \
+         $(CC) -x$$lang -DUNICODE $(TEST_OPTIONS); \
        done
        @echo "windres..."
-       @$(WINDRES) --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
+       $(WINDRES) --include-dir ${INCDIR} -i ${srcdir}/res.rc -o test.o
        @echo "windres UNICODE..."
-       @$(WINDRES) --define UNICODE --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
-       @rm -f test.o
+       $(WINDRES) --define UNICODE --include-dir ${INCDIR} -i ${srcdir}/res.rc -o test.o
+       rm -f test.o
 
 # Rules
 #
@@ -79,16 +79,16 @@ install: install-libraries install-headers
 
 install-libraries: all $(need-DESTDIR-compatibility)
        $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-       for i in $(LIBS); do \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(inst_libdir)/$$i; \
+       for file in $(LIBS); do \
+         $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/$$file; \
        done
 
 ddk_includedir = ${inst_includedir}/ddk
 
 install-headers: $(need-DESTDIR-compatibility)
        $(mkinstalldirs) $(DESTDIR)${ddk_includedir}
-       for i in $(HEADERS); do \
-               $(INSTALL_DATA) $(srcdir)/../../include/ddk/$$i $(DESTDIR)${ddk_includedir}; \
+       for file in $(HEADERS); do \
+               $(INSTALL_DATA) $(srcdir)/../../include/ddk/$$file $(DESTDIR)${ddk_includedir}; \
        done
 
 # Uninstall headers and libraries from a target specified directory
@@ -96,27 +96,27 @@ install-headers: $(need-DESTDIR-compatibility)
 uninstall: uninstall-libraries uninstall-headers
 
 uninstall-libraries: $(need-DESTDIR-compatibility)
-       @for i in $(LIBS); do \
-               rm -f $(DESTDIR)$(inst_libdir)/$$i; \
+       for file in $(LIBS); do \
+         rm -f $(DESTDIR)$(inst_libdir)/$$file; \
        done
        rmdir $(DESTDIR)$(inst_libdir)
 
 uninstall-headers: $(need-DESTDIR-compatibility)
-       @for i in $(HEADERS); do \
-               rm -r $(DESTDIR)${ddk_includedir}/$$i; \
+       for file in $(HEADERS); do \
+         rm -r $(DESTDIR)${ddk_includedir}/$$file; \
        done
        rmdir $(DESTDIR)${ddk_includedir}
 
 dist:
        mkdir $(distdir)/include/ddk
        chmod 755 $(distdir)/include/ddk
-       @for i in $(HEADERS); do \
-               cp -p $(srcdir)/../../include/ddk/$$i $(distdir)/include/ddk/$$i; \
+       for file in $(HEADERS); do \
+         cp -p $(srcdir)/../../include/ddk/$$file $(distdir)/include/ddk/$$file; \
        done
        mkdir $(distdir)/lib/ddk
        chmod 755 $(distdir)/lib/ddk
-       @for i in $(DISTFILES); do \
-               cp -p $(srcdir)/$$i $(distdir)/lib/ddk/$$i; \
+       for file in $(DISTFILES); do \
+         cp -p $(srcdir)/$$file $(distdir)/lib/ddk/$$file; \
        done
 
 Makefile: Makefile.in ../../config.status ../../configure

diff --git a/winsup/w32api/lib/directx/Makefile.in b/winsup/w32api/lib/directx/Makefile.in
index b3b9563..2416523 100644 (file)
--- a/winsup/w32api/lib/directx/Makefile.in
+++ b/winsup/w32api/lib/directx/Makefile.in
@@ -66,17 +66,17 @@ TEST_OPTIONS = $(ALL_CFLAGS) -Wall -pedantic -Wsystem-headers -c $(srcdir)/test.
 .PHONY: test
 test:
        @echo "Testing directx..."
-       @for lang in c c++ objective-c ; do \
-               echo "$$lang..."; \
-               $(CC) -x$$lang $(TEST_OPTIONS) ; \
-               echo "$$lang UNICODE..."; \
-               $(CC) -x$$lang -DUNICODE $(TEST_OPTIONS) ; \
+       @for lang in c c++ objective-c; do \
+         echo "$$lang..."; \
+         $(CC) -x$$lang $(TEST_OPTIONS); \
+         echo "$$lang UNICODE..."; \
+         $(CC) -x$$lang -DUNICODE $(TEST_OPTIONS); \
        done
        @echo "windres..."
-       @$(WINDRES) --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
+       $(WINDRES) --include-dir ${INCDIR} -i ${srcdir}/res.rc -o test.o
        @echo "windres UNICODE..."
-       @$(WINDRES) --define UNICODE --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
-       @rm -f test.o
+       $(WINDRES) --define UNICODE --include-dir ${INCDIR} -i ${srcdir}/res.rc -o test.o
+       rm -f test.o
 
 # Rules
 #
@@ -104,14 +104,14 @@ install: install-libraries install-headers
 
 install-libraries: all $(need-DESTDIR-compatibility)
        $(mkinstalldirs) $(DESTDIR)$(inst_libdir)
-       for i in $(LIBS); do \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(inst_libdir)/$$i ; \
+       for file in $(LIBS); do \
+         $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/$$file; \
        done
 
 install-headers: $(need-DESTDIR-compatibility)
        $(mkinstalldirs) $(DESTDIR)$(inst_includedir)
-       for i in $(HEADERS); do \
-               $(INSTALL_DATA) $(srcdir)/../../include/directx/$$i $(DESTDIR)$(inst_includedir)/$$i ; \
+       for file in $(HEADERS); do \
+         $(INSTALL_DATA) $(srcdir)/../../include/directx/$$file $(DESTDIR)$(inst_includedir)/$$file; \
        done
 
 # Uninstall headers and libraries from a target specified directory
@@ -119,27 +119,27 @@ install-headers: $(need-DESTDIR-compatibility)
 uninstall: uninstall-libraries uninstall-headers
 
 uninstall-libraries: $(need-DESTDIR-compatibility)
-       @for i in $(LIBS); do \
-               rm -f $(DESTDIR)$(inst_libdir)/$$i ; \
+       for file in $(LIBS); do \
+         rm -f $(DESTDIR)$(inst_libdir)/$$file; \
        done
        rmdir $(DESTDIR)$(inst_libdir)
 
 uninstall-headers: $(need-DESTDIR-compatibility)
-       @for i in $(HEADERS); do \
-               rm -r $(DESTDIR)$(inst_includedir)/$$i ; \
+       for file in $(HEADERS); do \
+         rm -r $(DESTDIR)$(inst_includedir)/$$file; \
        done
        rmdir $(DESTDIR)$(inst_includedir)
 
 dist:
        mkdir $(distdir)/include/directx
        chmod 755 $(distdir)/include/directx
-       @for i in $(HEADERS); do \
-               cp -p $(srcdir)/../../include/directx/$$i $(distdir)/include/directx/$$i ; \
+       for file in $(HEADERS); do \
+         cp -p $(srcdir)/../../include/directx/$$file $(distdir)/include/directx/$$file; \
        done
        mkdir $(distdir)/lib/directx
        chmod 755 $(distdir)/lib/directx
-       @for i in $(DISTFILES); do \
-               cp -p $(srcdir)/$$i $(distdir)/lib/directx/$$i ; \
+       for file in $(DISTFILES); do \
+         cp -p $(srcdir)/$$file $(distdir)/lib/directx/$$file; \
        done
 
 Makefile: Makefile.in ../../config.status ../../configure