From 374349395edd2e4bd4e27a185e5c45f0fb6ad5f4 Mon Sep 17 00:00:00 2001
From: Keith Marshall <keithmarshall@@users.sf.net>
Date: Sat, 11 Oct 2008 21:59:04 +0000
Subject: [PATCH] Use de-facto standard Makefile goals to invoke test suite.

---
 winsup/mingw/ChangeLog   |  9 +++++++++
 winsup/mingw/Makefile.in | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 29083b6cb..9e66a8719 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-11  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+	Use de-facto standard Makefile goals to invoke test suite.
+
+	* Makefile.in: Some minor formatting adjustments.
+	(test_headers): Unconventionally named goal renamed to...
+	(check-headers): ...this; make it a prerequisite of...
+	(check): ...this new conventionally named goal.
+
 2008-10-11  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
 	Make strtod() inline definition C89 compliant.
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 1a46d59f3..a2bb4b3a5 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -189,14 +189,14 @@ MOLD_OBJS = isascii.o iscsym.o iscsymf.o toascii.o \
 	strcasecmp.o strncasecmp.o wcscmpi.o
 
 LIBS = libcrtdll.a \
-       libmsvcrt.a libmsvcrtd.a \
+       libmsvcrt.a  libmsvcrtd.a \
        libmsvcr70.a libmsvcr70d.a \
        libmsvcr71.a libmsvcr71d.a \
        libmsvcr80.a libmsvcr80d.a \
        libmsvcr90.a libmsvcr90d.a \
        libmingw32.a \
        libcoldname.a \
-       libmoldname.a libmoldnamed.a \
+       libmoldname.a   libmoldnamed.a \
        libmoldname70.a libmoldname70d.a \
        libmoldname71.a libmoldname71d.a \
        libmoldname80.a libmoldname80d.a \
@@ -305,7 +305,10 @@ libmoldname.a libmoldnamed.a: moldname-msvcrt.def $(MOLD_OBJS)
 	$(AR) rc $@ $(MOLD_OBJS)
 	$(RANLIB) $@
 
-libmoldname70.a libmoldname70d.a libmoldname71.a libmoldname71d.a libmoldname80.a libmoldname80d.a libmoldname90.a libmoldname90d.a: moldname-msvcrt.def $(MOLD_OBJS)
+libmoldname70.a libmoldname70d.a \
+libmoldname71.a libmoldname71d.a \
+libmoldname80.a libmoldname80d.a \
+libmoldname90.a libmoldname90d.a: moldname-msvcrt.def $(MOLD_OBJS)
 	$(DLLTOOL) --as $(AS) -k -U	\
 		--dllname msvcr$(@:libmoldname%a=%)dll  \
 		--def moldname-msvcrt.def	\
@@ -320,11 +323,13 @@ crt1.o dllcrt1.o:
 crt2.o dllcrt2.o:
 	$(CC) -c -D__MSVCRT__ -U__CRTDLL__ $(ALL_CFLAGS) $< -o $@
 
+check: check-headers
+
 TEST_H_OPTIONS = $(ALL_CFLAGS) -Wall -W -Wsystem-headers -c \
 	$(srcdir)/test_headers.c -o test_headers.o
 
-.PHONY: test_headers
-test_headers:
+.PHONY: check-headers
+check-headers: force
 	@echo "Testing runtime headers..."
 	@for lang in c c++ objective-c ; do \
 		echo "$$lang ..."; \