Fix make clean for recent elf/Makefile changes.

diff --git a/ChangeLog b/ChangeLog
index c6795cb..db2f8bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-03  Roland McGrath  <roland@hack.frob.com>
+
+       * elf/Makefile (common-generated): Set this instead of generated for
+       .dyn, .phdr, .jmprel files.  Remove $(common-objpfx) from the
+       $(all-built-dso)-derived lists.
+
 2012-05-03  Andreas Jaeger  <aj@suse.de>
 
        * sysdeps/i386/fpu/libm-test-ulps: Update.

diff --git a/elf/Makefile b/elf/Makefile
index 47729c3..8743ee0 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -899,7 +899,7 @@ $(all-built-dso:=.dyn): %.dyn: %
        LC_ALL=C $(READELF) -W -d $< > $@T
        test -s $@T
        mv -f $@T $@
-generated += $(all-built-dso:=.dyn)
+common-generated += $(all-built-dso:$(common-objpfx)%=%.dyn)
 
 $(objpfx)check-textrel.out: $(..)scripts/check-textrel.awk \
                            $(all-built-dso:=.dyn)
@@ -925,7 +925,7 @@ $(all-built-dso:=.phdr): %.phdr: %
        LC_ALL=C $(READELF) -W -l $< > $@T
        test -s $@T
        mv -f $@T $@
-generated += $(all-built-dso:=.phdr)
+common-generated += $(all-built-dso:$(common-objpfx)%=%.phdr)
 
 $(objpfx)check-execstack.out: $(..)scripts/check-execstack.awk \
                              $(objpfx)execstack-default \
@@ -941,7 +941,7 @@ $(all-built-dso:=.jmprel): %.jmprel: % Makefile
        LC_ALL=C $(READELF) -W -S -d -r $< > $@T
        test -s $@T
        mv -f $@T $@
-generated += $(all-built-dso:=.jmprel)
+common-generated += $(all-built-dso:$(common-objpfx)%=%.jmprel)
 
 check-data := $(firstword $(wildcard \
                $(foreach D,$(add-ons) scripts,\