5 files changed, 22 insertions, 9 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 05012f9..63a5884 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,17 @@
 2012-01-15  Keith Marshall  <keithmarshall@users.sf.net>
 
+	Add 'check' as GCS conforming alias for make's 'test' goal.
+
+	* Makefile.in (check): New goal; declare as .PHONY; implement it as...
+	(test): ... alternative goal name for this; the original 'test' goal
+	may now be considered as deprecated, but there is no pressing need to
+	withdraw support for it.
+
+	* lib/Makefile.in lib/ddk/Makefile.in lib/directx/Makefile.in:
+	(check, test): Likewise.
+
+2012-01-15  Keith Marshall  <keithmarshall@users.sf.net>
+
 	More makefile code refactoring; remove redundant INCLUDES references.
 
 	* lib/directx/Makefile.in (INCLUDES): Reference to include/directx
diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
index c8d5ce9..f70ce08 100644
--- a/winsup/w32api/Makefile.in
+++ b/winsup/w32api/Makefile.in
@@ -43,8 +43,8 @@ all: $(SUBDIRS)
 $(SUBDIRS):
 	$(MAKE) -C $@
 
-test:
-	$(MAKE) -C lib test
+check test:
+	$(MAKE) -C lib $@
 
 install uninstall:
 	for dir in $(SUBDIRS); do \
@@ -141,6 +141,6 @@ distclean: clean-top
 
 maintainer-clean: maintainer-clean-subdirs
 
-.PHONY: lib test 
+.PHONY: lib check test 
 
 # Makefile.in: end of file
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index afe362c..507e002 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -64,7 +64,7 @@ DISTFILES = Makefile.in $(DEF_FILES) $(MRI_FILES) $(SOURCES)
 
 .NOTPARALLEL:
 .PHONY: install install-libraries install-headers install-ddk
-.PHONY: test $(SUBDIRS)
+.PHONY: check test $(SUBDIRS)
 
 # Targets: (note that 'all-default' is a redirection from 'all',
 # which is the primary default target identified in the included
@@ -87,7 +87,7 @@ TEST_OPTIONS = \
   $(ALL_CFLAGS) -DWINVER=0x0666 -Wall -pedantic -Wsystem-headers \
   -c ${srcdir}/test.c -o test.o
 
-test:
+check test:
 	@echo "Testing w32api..."
 	@for lang in c c++ objective-c ; do \
 	  echo "$$lang..."; \
diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in
index a3d2b27..001cd24 100644
--- a/winsup/w32api/lib/ddk/Makefile.in
+++ b/winsup/w32api/lib/ddk/Makefile.in
@@ -41,8 +41,8 @@ TEST_OPTIONS = \
   $(ALL_CFLAGS) -Wall -pedantic -Wsystem-headers \
   -c ${srcdir}/test.c -o test.o
 
-.PHONY: test
-test:
+.PHONY: check test
+check test:
 	@echo "Testing ddk..."
 	@for lang in c c++ objective-c; do \
 	  echo "$$lang..."; \
diff --git a/winsup/w32api/lib/directx/Makefile.in b/winsup/w32api/lib/directx/Makefile.in
index bb57718..2970c5b 100644
--- a/winsup/w32api/lib/directx/Makefile.in
+++ b/winsup/w32api/lib/directx/Makefile.in
@@ -50,8 +50,9 @@ all-default: $(LIBS)
 TEST_OPTIONS = \
   $(ALL_CFLAGS) -Wall -pedantic -Wsystem-headers \
   -c ${srcdir}/test.c -o test.o
-.PHONY: test
-test:
+
+.PHONY: check test
+check test:
 	@echo "Testing directx..."
 	@for lang in c c++ objective-c; do \
 	  echo "$$lang..."; \