From: Roland McGrath <roland@gnu.org>
Date: Thu, 25 Mar 2004 02:01:27 +0000 (+0000)
Subject: 2004-03-24  Roland McGrath  <roland@redhat.com>
X-Git-Tag: upstream/2.20~11089
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad243052be44324b1e864e02612d8795cb54f1fc;p=platform%2Fupstream%2Flinaro-glibc.git

2004-03-24  Roland McGrath  <roland@redhat.com>

	* Makefile ($(objpfx)c++-types-check.out): Reduce duplication in
	defining this target.  Also elide -Wstrict-prototypes from CFLAGS.
---

diff --git a/Makefile b/Makefile
index c85dc36..5089063 100644
--- a/Makefile
+++ b/Makefile
@@ -225,20 +225,18 @@ tests-clean:
 
 tests: $(objpfx)c++-types-check.out
 ifneq ($(CXX),no)
-ifneq (,$(wildcard scripts/data/c++-types-$(config-machine)-$(config-os).data))
-$(objpfx)c++-types-check.out: scripts/data/c++-types-$(config-machine)-$(config-os).data
-	scripts/check-c++-types.sh $^ $(CXX) $(filter-out -std=gnu99,$(CFLAGS)) $(CPPFLAGS) > $@
-else
-ifneq (,$(wildcard scripts/data/c++-types-$(base-machine)-$(config-os).data))
-$(objpfx)c++-types-check.out: scripts/data/c++-types-$(base-machine)-$(config-os).data
-	scripts/check-c++-types.sh $^ $(CXX) $(filter-out -std=gnu99,$(CFLAGS)) $(CPPFLAGS) > $@
+check-data := $(firstword $(wildcard \
+	        $(foreach M,$(config-machine) $(base-machine),\
+			  scripts/data/c++-types-$M-$(config-os).data)))
+ifneq (,$(check-data))
+$(objpfx)c++-types-check.out: $(check-data)
+	scripts/check-c++-types.sh $^ $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@
 else
 $(objpfx)c++-types-check.out:
 	@echo 'WARNING C++ tests not run; create a c++-types-XXX file'
 	@echo "not run" > $@
 endif
 endif
-endif
 
 # The realclean target is just like distclean for the parent, but we want
 # the subdirs to know the difference in case they care.