JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve self-documentation of 'for' loop commands.

Browse Source
This commit is contained in:
Keith Marshall 2012-01-15 12:39:00 +00:00
parent 3ef7500436
commit c6a4777d85
5 changed files with 88 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/w32api/ChangeLog
View File

@ -1,3 +1,12 @@
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> 2012-01-15 Keith Marshall <keithmarshall@users.sf.net>
Generalise 'all' rule to arbitrary prerequisite sub-directories. Generalise 'all' rule to arbitrary prerequisite sub-directories.

16
winsup/w32api/Makefile.in
View File

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

62
winsup/w32api/lib/Makefile.in
View File

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

40
winsup/w32api/lib/ddk/Makefile.in
View File

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

40
winsup/w32api/lib/directx/Makefile.in
View File

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