[BZ #3018]

2006-07-30  Joseph S. Myers  <joseph@codesourcery.com>
	[BZ #3018]
	* Makerules (depfiles): Handle extra-test-objs the same as
	extra-objs.
	(common-mostlyclean): Likewise.
	* dlfcn/Makefile (extra-objs): Add modules to extra-test-objs
	instead.
	* elf/Makefile (extra-objs): Likewise.
	* stdlib/Makefile (extra-objs): Likewise.

diff --git a/ChangeLog b/ChangeLog
index b83f02545b09e1a206dd5460bad72b333ca29b52..3797bc320eae320e2cc57e838d9dccfe03e16cf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-30  Joseph S. Myers  <joseph@codesourcery.com>
+
+       [BZ #3018]
+       * Makerules (depfiles): Handle extra-test-objs the same as
+       extra-objs.
+       (common-mostlyclean): Likewise.
+       * dlfcn/Makefile (extra-objs): Add modules to extra-test-objs
+       instead.
+       * elf/Makefile (extra-objs): Likewise.
+       * stdlib/Makefile (extra-objs): Likewise.
+
 2006-08-14  Eric Blake <ebb9@byu.net>
 
        [BZ #3044]

diff --git a/Makerules b/Makerules
index 98a06400b5e33b4907e68b019a589e8a358bbc8a..f50f7a4884954f86ccbbc4eaf84474f07ac878d8 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -688,6 +688,7 @@ endif
 \f
 +depfiles := $(sources:.c=.d) \
             $(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \
+            $(patsubst %.o,%.d,$(filter %.o,$(extra-test-objs:.os=.o))) \
             $(addsuffix .d,$(tests) $(xtests) $(test-srcs))
 ifeq ($(build-programs),yes)
 +depfiles += $(addsuffix .d,$(others) $(sysdep-others))
@@ -1369,8 +1370,8 @@ common-mostlyclean:
                                                      $(test-srcs)) \
                                     $(addsuffix -bp.out,$(tests) $(xtests) \
                                                         $(test-srcs)))
-       -rm -f $(addprefix $(objpfx),$(extra-objs) $(install-lib) \
-                                    $(install-lib.so) \
+       -rm -f $(addprefix $(objpfx),$(extra-objs) $(extra-test-objs) \
+                                    $(install-lib) $(install-lib.so) \
                                     $(install-lib.so:%.so=%_pic.a))
        -rm -f core
        -rm -f $(objpfx)rtld-*.os

diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index 649f61de63437f2dac84946e2051a922ecade9f5..ffdb70ea6833b138c8e398f6ac27334c1ea69aa6 100644 (file)
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -63,7 +63,7 @@ tststatic-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf
 tststatic2-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf
 endif
 
-extra-objs += $(modules-names:=.os)
+extra-test-objs += $(modules-names:=.os)
 generated := $(modules-names:=.so)
 
 include ../Rules

diff --git a/elf/Makefile b/elf/Makefile
index 3b4ef26d450df08e5c233b080b69f09281235ef4..402fc18636671ddf5b215c75e3c8c432446ee3d0 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -223,7 +223,7 @@ modules-nodelete-yes = nodelmod1 nodelmod2 nodelmod3 nodelmod4 \
                       nodel2mod1 nodel2mod2 nodel2mod3
 modules-nodlopen-yes = nodlopenmod nodlopenmod2
 modules-execstack-yes = tst-execstack-mod
-extra-objs += $(addsuffix .os,$(strip $(modules-names)))
+extra-test-objs += $(addsuffix .os,$(strip $(modules-names)))
 # We need this variable to be sure the test modules get the right CPPFLAGS.
 test-extras += $(modules-names)
 

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 498142cb563cb22ee4b96c53ecb6852e8d5f8b74..aacea778356a37ba71ec6fce4c4d49d2b43d49bf 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-30  Joseph S. Myers  <joseph@codesourcery.com>
+
+       [BZ #3018]
+       * Makefile (extra-objs): Add modules to extra-test-objs instead.
+
 2006-08-20  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/bits/posix_opt.h: Define

diff --git a/nptl/Makefile b/nptl/Makefile
index 3ba647ab70807f3646532f023d023615c14f8f25..451609aee44f91a3a8683d7b4db6955f909b2238 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -297,7 +297,7 @@ modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \
                tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \
                tst-tls5modd tst-tls5mode tst-tls5modf \
                tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod
-extra-objs += $(addsuffix .os,$(strip $(modules-names))) tst-cleanup4aux.o
+extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) tst-cleanup4aux.o
 test-extras += $(modules-names)
 test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
 

diff --git a/stdlib/Makefile b/stdlib/Makefile
index c857eac744c6ba7593c3032f1fc09c10a111ba25..e632d3523b47bf553ce0f9e592a1080cb187d26e 100644 (file)
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -86,7 +86,7 @@ aux += fpioconst mp_clz_tab
 distribute := $(distribute) $(mpn-headers) fpioconst.h tst-putenvmod.c
 
 tests-extras += tst-putenvmod
-extra-objs += tst-putenvmod.os
+extra-test-objs += tst-putenvmod.os
 
 generated += isomac isomac.out tst-putenvmod.so