about summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-03-25 02:01:27 +0000
committerRoland McGrath <roland@gnu.org>2004-03-25 02:01:27 +0000
commitad243052be44324b1e864e02612d8795cb54f1fc (patch)
tree44dc601de06bda5b2ba31fce69decfb364088ff4 /Makefile
parent68dc4dcbddb050072f959118b6793dfadf395a06 (diff)
downloadglibc-ad243052be44324b1e864e02612d8795cb54f1fc.tar.gz
glibc-ad243052be44324b1e864e02612d8795cb54f1fc.tar.xz
glibc-ad243052be44324b1e864e02612d8795cb54f1fc.zip
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index c85dc364a8..5089063a55 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.