diff --git a/ChangeLog b/ChangeLog
index e47cf4dfe8..a4fe591c8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-23  Roland McGrath  <roland@redhat.com>
+
+	* elf/Makefile (test-extras): Define this instead of test-srcs.
+	* Makerules (all-nonlib): Include $(test-extras) too.
+
 2002-09-21  Carlos O'Donell  <carlos@baldric.uwo.ca>
 
 	* sysdeps/hppa/abort-instr.h: New file.
diff --git a/Makerules b/Makerules
index 59fcdaecef..dee6820d43 100644
--- a/Makerules
+++ b/Makerules
@@ -1040,7 +1040,7 @@ check: tests
 .PHONY: xcheck
 xcheck: xtests
 
-all-nonlib = $(strip $(tests) $(xtests) $(test-srcs) $(others))
+all-nonlib = $(strip $(tests) $(xtests) $(test-srcs) $(test-extras) $(others))
 ifneq (,$(all-nonlib))
 cpp-srcs-left = $(all-nonlib:=.c)
 lib := tests
diff --git a/elf/Makefile b/elf/Makefile
index ddc7a54c07..e452eccb75 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -150,7 +150,8 @@ modules-vis-yes = vismod1 vismod2 vismod3
 modules-nodelete-yes = nodelmod1 nodelmod2 nodelmod3 nodelmod4
 modules-nodlopen-yes = nodlopenmod nodlopenmod2
 extra-objs += $(addsuffix .os,$(strip $(modules-names)))
-test-srcs += $(modules-names)
+# We need this variable to be sure the test modules get the right CPPFLAGS.
+test-extras += $(modules-names)
 
 include ../Rules